fix pom error (#175)

Signed-off-by: yhmo <yihua.mo@zilliz.com>

examples/pom.xml

@@ -25,11 +25,7 @@
 
     <groupId>io.milvus</groupId>
     <artifactId>milvus-sdk-java-examples</artifactId>
-<<<<<<< HEAD
-    <version>1.0.0-SNAPSHOT</version>
-=======
     <version>1.0.0</version>
->>>>>>> 1.0.0
     <build>
         <plugins>
             <plugin>
@@ -67,7 +63,7 @@
         <dependency>
             <groupId>io.milvus</groupId>
             <artifactId>milvus-sdk-java</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

pom.xml

@@ -25,11 +25,7 @@
 
     <groupId>io.milvus</groupId>
     <artifactId>milvus-sdk-java</artifactId>
-<<<<<<< HEAD
-    <version>1.0.0-SNAPSHOT</version>
-=======
     <version>1.0.0</version>
->>>>>>> 1.0.0
     <packaging>jar</packaging>
 
     <name>io.milvus:milvus-sdk-java</name>