Updating develop to snapshot version 1.2=SNAPSHOT

kairosdb · Apr 19, 2022 · d9393f6 · d9393f6
2 parents 69dfe1d + e3e982c
commit d9393f6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,11 @@
 
     <groupId>org.kairosdb</groupId>
     <artifactId>kairos-influx</artifactId>
+<<<<<<< HEAD
     <version>1.1-SNAPSHOT</version>
+=======
+    <version>1.1</version>
+>>>>>>> master
 
     <dependencies>
         <dependency>