Updating develop to snapshot version 1.2=SNAPSHOT

Author: brianhks

Diff for: 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>