usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [4/9] git commit: Fix bothed merge of stack pom.xml
Date Thu, 21 Aug 2014 14:10:00 GMT
Fix bothed merge of stack pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b1ed7d32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b1ed7d32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b1ed7d32

Branch: refs/heads/master
Commit: b1ed7d3208f3d2dd7f3cc9b6628925456121d422
Parents: 97cdb05
Author: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Authored: Wed Aug 20 22:15:58 2014 -0700
Committer: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Committed: Wed Aug 20 22:15:58 2014 -0700

----------------------------------------------------------------------
 stack/pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b1ed7d32/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 48b7887..28566f4 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -27,15 +27,9 @@
 
   <groupId>org.apache.usergrid</groupId>
   <artifactId>usergrid</artifactId>
-<<<<<<< HEAD
   <version>0.0.29-SNAPSHOT</version>
-  <name>Usergrid Parent </name>
-  <description>Parent module for the Apache Usergrid Project</description>
-=======
-  <version>0.0.29</version>
   <name>Usergrid Parent</name>
-  <description>Usergrid Project</description>
->>>>>>> b73a3acace06cdccd2857e2475e6ad6e74f2d197
+  <description>Parent module for the Apache Usergrid Project</description>
   <packaging>pom</packaging>
 
   <properties>


Mime
View raw message