Fix issue with previous merge

fengqiliu · Nov 29, 2021 · 0af81d9 · 0af81d9
1 parent 527b5fc
commit 0af81d9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/sdk/pom.xml b/sdk/pom.xml
@@ -10,11 +10,7 @@
     <parent>
         <groupId>pt.ua.ieeta</groupId>
         <artifactId>dicoogle-all</artifactId>
-<<<<<<< HEAD
-        <version>3.0.2</version>
-=======
         <version>3.0.3-SNAPSHOT</version>
->>>>>>> e3b75f5be20774473a909ede235063722150697a
         <relativePath>../pom.xml</relativePath>
     </parent>