From c0eb15f23800990d791fbacb4b319257eb80fd6e Mon Sep 17 00:00:00 2001
From: Ben Butler-Cole <ben@bridesmere.com>
Date: Tue, 19 May 2015 12:45:10 +0100
Subject: [PATCH] Fix merge error.

---
 community/cypher/docs/refcard-tests/pom.xml | 6 +-----
 manual/refcard/pom.xml                      | 4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/community/cypher/docs/refcard-tests/pom.xml b/community/cypher/docs/refcard-tests/pom.xml
index e89c88c04af00..82eac9f0e23f0 100644
--- 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
index 00626ce380057..1b02f0accb5cb 100644
--- 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>