Github user anuruddhal commented on the pull request:
https://github.com/apache/stratos/pull/370#issuecomment-113416237
Hi Imesh,
I haven't done any changes in classes that have merge conflicts. And in the
git hub it says "This pull request can be automatically merged by project
collaborators."
Shall I resend the PR ?
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
