BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4449b95)
minor
authorKatja Luther <k.luther@bgbm.org>
Tue, 14 Nov 2017 10:26:49 +0000 (11:26 +0100)
committerKatja Luther <k.luther@bgbm.org>
Tue, 14 Nov 2017 10:26:49 +0000 (11:26 +0100)
eu.etaxonomy.taxeditor/pom.xml patch | blob | history

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index 9255c25c1cf0afe286f9b875b14071575d8f95ce..b52f0048e3481bb59608041ad3aead30c9ff057b 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -2,11 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-<<<<<<< HEAD
     <version>4.12.0-SNAPSHOT</version>
-=======
-    <version>4.11.1</version>
->>>>>>> hotfix/4.11.1
   </parent>
 
   <modelVersion>4.0.0</modelVersion>