Merge branch 'master' of https://github.com/52North/maven-parents

* 'master' of https://github.com/52North/maven-parents:
  [maven-release-plugin] prepare for next development iteration

Author: autermann

checkstyle-configuration/pom.xml

@@ -4,7 +4,11 @@
     <parent>
         <groupId>org.n52</groupId>
         <artifactId>parent</artifactId>
+<<<<<<< HEAD
         <version>30-SNAPSHOT</version>
+=======
+        <version>29-SNAPSHOT</version>
+>>>>>>> 8ed182c1bf34e5074fd90d20ba7adc690e11912a
     </parent>
     <artifactId>checkstyle-configuration</artifactId>
     <name>52°North Checkstyle Configuration</name>

pom.xml

@@ -4,7 +4,11 @@
 
     <groupId>org.n52</groupId>
     <artifactId>parent</artifactId>
+<<<<<<< HEAD
     <version>30-SNAPSHOT</version>
+=======
+    <version>29-SNAPSHOT</version>
+>>>>>>> 8ed182c1bf34e5074fd90d20ba7adc690e11912a
 
     <packaging>pom</packaging>
 
@@ -38,7 +42,11 @@
         <url>https://github.com/52North/maven-parents</url>
         <connection>scm:git:https://github.com/52North/maven-parents.git</connection>
         <developerConnection>scm:git:https://github.com/52North/maven-parents.git</developerConnection>
+<<<<<<< HEAD
         <tag>HEAD</tag>
+=======
+        <tag>v27</tag>
+>>>>>>> 8ed182c1bf34e5074fd90d20ba7adc690e11912a
     </scm>
 
     <issueManagement>