Fix weird conflict

matthewelwell · matthewelwell · commit 6206cf115919 · 2023-03-30T11:53:44.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -6,11 +6,7 @@
 
   <groupId>com.flagsmith</groupId>
   <artifactId>flagsmith-java-client</artifactId>
-<<<<<<< HEAD
   <version>6.1.0</version>
-=======
-  <version>6.0.1</version>
->>>>>>> origin/main
   <packaging>jar</packaging>
 
   <name>Flagsmith Java Client</name>
