You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2017/10/14 05:58:41 UTC
[3/4] oodt git commit: Resolve conflicts again.
Resolve conflicts again.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/55b0f001
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/55b0f001
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/55b0f001
Branch: refs/heads/master
Commit: 55b0f0014327f529803dc2c734a32710befe8481
Parents: 401f241
Author: Chris Mattmann <ch...@jpl.nasa.gov>
Authored: Fri Oct 13 22:51:39 2017 -0700
Committer: Chris Mattmann <ch...@jpl.nasa.gov>
Committed: Fri Oct 13 22:51:39 2017 -0700
----------------------------------------------------------------------
commons/pom.xml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/55b0f001/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index cf54eba..5054be3 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -177,10 +177,7 @@
</build>
</profile>
</profiles>
-<<<<<<< HEAD
-=======
<dependencies>
-
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>