updating develop poms to master versions to avoid merge conflicts

diff --git a/pom.xml b/pom.xml
index 74c2a2021d1788cc8f21f5e4db682129809a7101..e0bc6010ccb990c65ef3588e737340930d192774 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdm-vaadin</artifactId>
   <packaging>war</packaging>
-  <version>3.12.0-SNAPSHOT</version>
+  <version>3.11.0</version>
   <name>Vaadin Web Application</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>