Fix merge error.

neo4j · May 19, 2015 · c0eb15f · c0eb15f
1 parent c85cb0f
commit c0eb15f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/community/cypher/docs/refcard-tests/pom.xml b/community/cypher/docs/refcard-tests/pom.xml
@@ -18,11 +18,7 @@
   <properties>
     <license-text.header>GPL-3-header.txt</license-text.header>
     <licensing.prepend.text>notice-gpl-prefix.txt</licensing.prepend.text>
-<<<<<<< HEAD
-    <neo4j.version>2.3-SNAPSHOT</neo4j.version>
-=======
     <neo4j.version>${project.version}</neo4j.version>
->>>>>>> 2.2
     <docs-plugin.skip>false</docs-plugin.skip>
     <attach-docs-phase>prepare-package</attach-docs-phase>
     <remote-csv-upload>http://neo4j.com/docs/${project.version}/cypher-refcard/csv</remote-csv-upload>
@@ -111,7 +107,7 @@
     </dependency>
 
     <!-- neo4j -->
-    
+
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-kernel</artifactId>

diff --git a/manual/refcard/pom.xml b/manual/refcard/pom.xml
@@ -16,11 +16,7 @@
   <packaging>jar</packaging>
 
   <properties>
-<<<<<<< HEAD
-    <neo4j.version>2.3-SNAPSHOT</neo4j.version>
-=======
     <neo4j.version>${project.version}</neo4j.version>
->>>>>>> 2.2
     <docs.tools>${project.build.directory}/tools</docs.tools>
     <docs.upstream>${project.build.directory}</docs.upstream>
     <docs.importdir>${docs.upstream}/docs</docs.importdir>