Fixed merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/15396047 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/15396047 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/15396047 Branch: refs/heads/current-release-line Commit: 15396047b2e85d57eb6ffa73dbc4296ead6c9f49 Parents: d559ef2 79261f9 Author: Deepak Barr <deepakb...@apache.org> Authored: Wed Feb 3 16:46:26 2016 +0530 Committer: Deepak Kumar Barr <deepak.b...@gmail.com> Committed: Wed Feb 3 16:46:26 2016 +0530 ---------------------------------------------------------------------- ----------------------------------------------------------------------
