fixing conflict with stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/44562bae Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/44562bae Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/44562bae Branch: refs/heads/stratos-4.1.x Commit: 44562bae23e58d69c2fafbe76cea35cd2b75c405 Parents: cbde779 bb22134 Author: Isuru Haththotuwa <[email protected]> Authored: Wed Dec 9 21:56:29 2015 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Wed Dec 9 21:56:29 2015 +0530 ---------------------------------------------------------------------- ----------------------------------------------------------------------
