fix(pom): fix the invalid merge

zanata · Oct 19, 2016 · 10a48eb · 10a48eb
1 parent fa74370
commit 10a48eb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/functional-test/pom.xml b/functional-test/pom.xml
@@ -4,11 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>server</artifactId>
-<<<<<<< HEAD
     <version>4.0.0-SNAPSHOT</version>
-=======
-    <version>3.9.7-SNAPSHOT</version>
->>>>>>> release
   </parent>
   <artifactId>functional-test</artifactId>
   <!--if we want to use pom packaging, we need to explicitly enable some plugins and various things-->