GitHub user chamilad opened a pull request:
https://github.com/apache/stratos/pull/193
Fixed merge conflicts on BasicPayloadData
This PR includes a commit that caused a merge conflict on PR #181 and
therefore was dropped.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/chamilad/stratos dropped-commit
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/stratos/pull/193.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #193
----
commit 2db4e0eacec3cbc03c64487b828ce9d44a642e15
Author: Chamila de Alwis <[email protected]>
Date: 2015-01-21T05:44:21Z
Fixed merge conflicts on BasicPayloadData
----
---
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.
---
