Fixed errors due to merge conflicts

neo4j · Oct 22, 2015 · 8dcfdd6 · 8dcfdd6
1 parent f1cdcae
commit 8dcfdd6
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 112 deletions.
diff --git a/manual/contents/pom.xml b/manual/contents/pom.xml
@@ -4,20 +4,12 @@
   <parent>
     <groupId>org.neo4j</groupId>
     <artifactId>parent</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.neo4j.doc</groupId>
   <artifactId>neo4j-manual-contents</artifactId>
-<<<<<<< HEAD
   <version>3.0.0-SNAPSHOT</version>
-=======
-  <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
 
   <name>Neo4j - Reference Manual Contents</name>
   <description>Neo4j Reference Manual Contents.</description>

diff --git a/manual/cypher/cypher-docs/pom.xml b/manual/cypher/cypher-docs/pom.xml
@@ -3,22 +3,14 @@
   <parent>
     <groupId>org.neo4j.doc</groupId>
     <artifactId>neo4j-cypher-docs-parent</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>neo4j-cypher-docs</artifactId>
   <packaging>jar</packaging>
-<<<<<<< HEAD
   <version>3.0.0-SNAPSHOT</version>
-=======
-  <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
   <name>Neo4j - Cypher Documentation</name>
   <description>Neo4j query language documentation</description>
   <url>http://components.neo4j.org/${project.artifactId}/${project.version}</url>

diff --git a/manual/cypher/graphgist/pom.xml b/manual/cypher/graphgist/pom.xml
@@ -4,19 +4,11 @@
   <parent>
     <groupId>org.neo4j.doc</groupId>
     <artifactId>neo4j-cypher-docs-parent</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <relativePath>..</relativePath>
   </parent>
   <artifactId>neo4j-graphgist</artifactId>
-<<<<<<< HEAD
   <version>3.0.0-SNAPSHOT</version>
-=======
-  <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
   <name>Neo4j - GraphGist</name>
   <description>Cypher tutorial documentation tool.</description>
 

diff --git a/manual/cypher/pom.xml b/manual/cypher/pom.xml
@@ -4,20 +4,12 @@
   <parent>
     <groupId>org.neo4j</groupId>
     <artifactId>cypher-parent</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <relativePath>../../community/cypher/</relativePath>
   </parent>
   <groupId>org.neo4j.doc</groupId>
   <artifactId>neo4j-cypher-docs-parent</artifactId>
-<<<<<<< HEAD
   <version>3.0.0-SNAPSHOT</version>
-=======
-  <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
   <name>Neo4j - Cypher Documentation Build</name>
   <description>Neo4j - Cypher Documentation Build</description>
   <packaging>pom</packaging>

diff --git a/manual/cypher/refcard-tests/pom.xml b/manual/cypher/refcard-tests/pom.xml
@@ -4,19 +4,11 @@
   <parent>
     <groupId>org.neo4j.doc</groupId>
     <artifactId>neo4j-cypher-docs-parent</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <relativePath>..</relativePath>
   </parent>
   <artifactId>neo4j-cypher-refcard-tests</artifactId>
-<<<<<<< HEAD
   <version>3.0.0-SNAPSHOT</version>
-=======
-  <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
   <name>Neo4j - Cypher Reference Card Tests</name>
   <description>Test for Reference Card for the Neo4j Cypher Query Language.</description>
   <url>http://components.neo4j.org/${project.artifactId}/${project.version}</url>

diff --git a/manual/javadocs/pom.xml b/manual/javadocs/pom.xml
@@ -5,21 +5,13 @@
   <parent>
     <groupId>org.neo4j</groupId>
     <artifactId>parent</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.neo4j.doc</groupId>
   <artifactId>neo4j-javadocs</artifactId>
-<<<<<<< HEAD
   <version>3.0.0-SNAPSHOT</version>
-=======
-  <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
 
   <name>Neo4j - Javadocs</name>
   <packaging>pom</packaging>

diff --git a/manual/manual/pom.xml b/manual/manual/pom.xml
@@ -4,20 +4,12 @@
   <parent>
     <groupId>org.neo4j</groupId>
     <artifactId>parent</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.neo4j.doc</groupId>
   <artifactId>neo4j-manual</artifactId>
-<<<<<<< HEAD
   <version>3.0.0-SNAPSHOT</version>
-=======
-  <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
 
   <name>Neo4j - Reference Manual</name>
   <description>Neo4j Reference Manual.</description>

diff --git a/manual/neo4j-harness-test/pom.xml b/manual/neo4j-harness-test/pom.xml
@@ -5,22 +5,14 @@
   <parent>
     <groupId>org.neo4j</groupId>
     <artifactId>parent</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.neo4j.test</groupId>
   <artifactId>neo4j-harness-test</artifactId>
-<<<<<<< HEAD
   <version>3.0.0-SNAPSHOT</version>
-=======
-  <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
 
   <packaging>jar</packaging>
 

diff --git a/manual/refcard/pom.xml b/manual/refcard/pom.xml
@@ -4,20 +4,12 @@
   <parent>
     <groupId>org.neo4j</groupId>
     <artifactId>parent</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <relativePath>../..</relativePath>
   </parent>
   <groupId>org.neo4j.doc</groupId>
   <artifactId>neo4j-cypher-refcard</artifactId>
-<<<<<<< HEAD
   <version>3.0.0-SNAPSHOT</version>
-=======
-  <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
   <name>Neo4j - Cypher Reference Card</name>
   <description>Reference Card for the Neo4j Cypher Query Language.</description>
   <url>http://components.neo4j.org/${project.artifactId}/${project.version}</url>

diff --git a/packaging/installer-linux/installer-debian/pom.xml b/packaging/installer-linux/installer-debian/pom.xml
@@ -4,21 +4,13 @@
   <parent>
     <groupId>org.neo4j</groupId>
     <artifactId>parent</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <relativePath>../../..</relativePath>
   </parent>
 
   <groupId>org.neo4j</groupId>
   <artifactId>neo4j-installer-debian</artifactId>
-<<<<<<< HEAD
   <version>3.0.0-SNAPSHOT</version>
-=======
-  <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
 
   <packaging>pom</packaging>
 

diff --git a/packaging/installer-linux/installer-rpm/installer-rpm-advanced/pom.xml b/packaging/installer-linux/installer-rpm/installer-rpm-advanced/pom.xml
@@ -4,20 +4,12 @@
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-installer-rpm</artifactId>
-<<<<<<< HEAD
         <version>3.0.0-SNAPSHOT</version>
-=======
-        <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
         <relativePath>..</relativePath>
     </parent>
 
     <artifactId>neo4j-advanced-rpm</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <packaging>pom</packaging>
 
 

diff --git a/packaging/installer-linux/installer-rpm/installer-rpm-community/pom.xml b/packaging/installer-linux/installer-rpm/installer-rpm-community/pom.xml
@@ -4,20 +4,12 @@
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-installer-rpm</artifactId>
-<<<<<<< HEAD
         <version>3.0.0-SNAPSHOT</version>
-=======
-        <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
         <relativePath>..</relativePath>
     </parent>
 
     <artifactId>neo4j-community-rpm</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <packaging>pom</packaging>
 
 

diff --git a/packaging/installer-linux/installer-rpm/installer-rpm-enterprise/pom.xml b/packaging/installer-linux/installer-rpm/installer-rpm-enterprise/pom.xml
@@ -4,20 +4,12 @@
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-installer-rpm</artifactId>
-<<<<<<< HEAD
         <version>3.0.0-SNAPSHOT</version>
-=======
-        <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
         <relativePath>..</relativePath>
     </parent>
 
     <artifactId>neo4j-enterprise-rpm</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <packaging>pom</packaging>
 
 

diff --git a/packaging/installer-linux/installer-rpm/pom.xml b/packaging/installer-linux/installer-rpm/pom.xml
@@ -5,11 +5,7 @@
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>parent</artifactId>
-<<<<<<< HEAD
         <version>3.0.0-SNAPSHOT</version>
-=======
-        <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
         <relativePath>../../..</relativePath>
     </parent>
     <properties>
@@ -18,11 +14,7 @@
     </properties>
 
     <artifactId>neo4j-installer-rpm</artifactId>
-<<<<<<< HEAD
     <version>3.0.0-SNAPSHOT</version>
-=======
-    <version>2.3.1-SNAPSHOT</version>
->>>>>>> upstream/2.3
     <packaging>pom</packaging>
 
     <name>Neo4j RPM Installers</name>