Fix version conflict in pom.xml

lizk886 · web-flow · commit 67812bec1c80 · 2025-12-17T16:51:55.000-08:00
diff --git a/pom.xml b/pom.xml
@@ -6,11 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
-<<<<<<< HEAD
-    <version>5.62.26</version>
-=======
     <version>5.62.24-r0</version>
->>>>>>> 1146c822367d6eabb0ea23afde41d59052ec887a
   
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
