From: Niels Erik G. Nielsen <nielserik@indexdata.com>
Date: Thu, 27 Jun 2013 20:47:10 +0000 (-0400)
Subject: Fixes merge error
X-Git-Tag: v0.0.7~25
X-Git-Url: http://git.indexdata.com/?p=mkjsf-moved-to-github.git;a=commitdiff_plain;h=5d68ffebf6d5bea672a6dfb93563a772b9073f74

Fixes merge error
---

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>