Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkjsf

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

diff --git a/pom.xml b/pom.xml
index 0b7170f..c79777f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -194,4 +195,4 @@
       </build>      \r
     </profile>\r
   </profiles>\r
-</project>\r
+</project>
\ No newline at end of file