Resolve conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/08dac042 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/08dac042 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/08dac042 Branch: refs/heads/master Commit: 08dac042ea2215ee8664dd8ca1b4adee466b9acb Parents: 9b1d272 eefef71 Author: Akila Perera <[email protected]> Authored: Sun Aug 30 23:45:41 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Sun Aug 30 23:45:41 2015 +0530 ---------------------------------------------------------------------- ----------------------------------------------------------------------
