ATLAS-2814: Fixed merge error.
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/985d06d0
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/985d06d0
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/985d06d0
Repository: atlas
Updated Branches:
refs/heads/master 1eb995434 -> 614415e0a
ATLAS-2814: Fixed merge error.
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/614415e0
Tree: