Fix opencga-test pom.xml merge conflict

opencb · Nov 4, 2019 · f7579ba · f7579ba
1 parent a161af1
commit f7579ba
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/opencga-test/pom.xml b/opencga-test/pom.xml
@@ -24,11 +24,7 @@
 
     <groupId>org.opencb.opencga</groupId>
     <artifactId>opencga-test</artifactId>
-<<<<<<< HEAD
-    <version>1.4.1</version>
-=======
     <version>1.4.2</version>
->>>>>>> hotfix-1.4.x
     <packaging>pom</packaging>
 
     <dependencies>