Fixes merge error

[mkjsf-moved-to-github.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index c79777f..405ad4f 100644 (file)
--- 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">\r
   <modelVersion>4.0.0</modelVersion>\r
   <groupId>com.indexdata</groupId>\r