BGBM BDI Projects / taxeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
merge hotfix4.11.1 into develop
[taxeditor.git] / eu.etaxonomy.taxeditor / pom.xml
diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index bdccde3d41ad685cad1684537ff3e54af1311bd1..9255c25c1cf0afe286f9b875b14071575d8f95ce 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -2,7 +2,11 @@
   <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>