From 5d68ffebf6d5bea672a6dfb93563a772b9073f74 Mon Sep 17 00:00:00 2001
From: "Niels Erik G. Nielsen" <nielserik@indexdata.com>
Date: Thu, 27 Jun 2013 16:47:10 -0400
Subject: [PATCH] Fixes merge error

---
 pom.xml |    1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c79777f..405ad4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.indexdata</groupId>
-- 
1.7.10.4