update test version

bsorrentino · Apr 11, 2017 · d5b95a9 · d5b95a9
2 parents 9d9a5d1 + 276e977
commit d5b95a9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/test/pom.xml b/test/pom.xml
@@ -4,7 +4,11 @@
 
   <groupId>org.bsc.maven</groupId>
   <artifactId>maven-processor-plugin-test</artifactId>
+<<<<<<< HEAD
   <version>3.3.2-SNAPSHOT</version>
+=======
+  <version>3.3.1</version>
+>>>>>>> hotfix/test_version
   <packaging>jar</packaging>
   <name>MAVEN PROCESSOR PLUGIN TEST- ${project.version}</name>
   <description></description>