Revert "Revert "[maven-release-plugin] prepare for next development i…

…teration"" This reverts commit 6762e4e.
tfantas · Sep 28, 2015 · 885429f · 885429f
1 parent 76ae963
commit 885429f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.devnull</groupId>
     <artifactId>zuul-parent</artifactId>
+<<<<<<< HEAD
     <version>1.6-SNAPSHOT</version>
+=======
+    <version>1.6.0</version>
+>>>>>>> parent of 858cd34... [maven-release-plugin] prepare for next development iteration
     <packaging>pom</packaging>
     <name>Zuul: Parent POM</name>
     <url>https://github.com/psmith/Zuul</url>

diff --git a/zuul-data/pom.xml b/zuul-data/pom.xml
@@ -7,7 +7,11 @@
     <parent>
         <groupId>org.devnull</groupId>
         <artifactId>zuul-parent</artifactId>
+<<<<<<< HEAD
         <version>1.6-SNAPSHOT</version>
+=======
+        <version>1.6.0</version>
+>>>>>>> parent of 858cd34... [maven-release-plugin] prepare for next development iteration
     </parent>
     <dependencies>
         <!-- DevNull -->

diff --git a/zuul-web/pom.xml b/zuul-web/pom.xml
@@ -8,7 +8,11 @@
     <parent>
         <groupId>org.devnull</groupId>
         <artifactId>zuul-parent</artifactId>
+<<<<<<< HEAD
         <version>1.6-SNAPSHOT</version>
+=======
+        <version>1.6.0</version>
+>>>>>>> parent of 858cd34... [maven-release-plugin] prepare for next development iteration
     </parent>
 
     <dependencies>