Fix pom error.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/835f16d0 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/835f16d0 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/835f16d0 Branch: refs/heads/master Commit: 835f16d08a8e758278efcc4b639387a3d1b0bf52 Parents: 758eece Author: Chris Mattmann <[email protected]> Authored: Sat Sep 2 08:38:47 2017 -0700 Committer: Chris Mattmann <[email protected]> Committed: Sat Sep 2 08:38:47 2017 -0700 ---------------------------------------------------------------------- core/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/835f16d0/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 96444d5..91f95ce 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -249,10 +249,11 @@ the License. <version>8.7</version> </dependency> <dependency> -<<<<<<< HEAD <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> <version>1.12</version> + </dependency> + <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> <version>3.3.0</version>
