Fix conflicts

jenkinsci · Jun 4, 2019 · 7d37b09 · 7d37b09
1 parent b12c589
commit 7d37b09
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,11 +11,7 @@
   </parent>
 
   <groupId>com.compuware.jenkins</groupId>
-<<<<<<< HEAD
   <version>2.2.1-SNAPSHOT</version>
-=======
-  <version>2.2.0.1-SNAPSHOT</version>
->>>>>>> branch 'CWE-148206-Functional-Test-Jenkins-plugin-must-allow-accounting-info-parameter' of git@github.com:jenkinsci/compuware-topaz-for-total-test-plugin.git
   <artifactId>compuware-topaz-for-total-test</artifactId>
   <packaging>hpi</packaging>