Github user imesh commented on the pull request:
https://github.com/apache/stratos/pull/203#issuecomment-72989003
@dinithis There are some merge conflicts in this pull request, can you
please resolve them?
CONFLICT (add/add): Merge conflict in
components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddNetworkPartitionCommand.java
CONFLICT (content): Merge conflict in
components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
