version update

whaleal · Sep 29, 2022 · 22b4eeb · 22b4eeb
1 parent ccd1203
commit 22b4eeb
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 16 deletions.
diff --git a/mars-core/pom.xml b/mars-core/pom.xml
@@ -5,11 +5,7 @@
     <parent>
         <artifactId>mars</artifactId>
         <groupId>com.whaleal.mars</groupId>
-<<<<<<< HEAD
         <version>0.8.72</version>
-=======
-        <version>0.8.84</version>
->>>>>>> b6a402ffba543f92805bbbc9124ce839c7cad06c
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mars-springboot/pom.xml b/mars-springboot/pom.xml
@@ -5,11 +5,7 @@
     <parent>
         <groupId>com.whaleal.mars</groupId>
         <artifactId>mars</artifactId>
-<<<<<<< HEAD
         <version>0.8.72</version>
-=======
-        <version>0.8.84</version>
->>>>>>> b6a402ffba543f92805bbbc9124ce839c7cad06c
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mars-test/pom.xml b/mars-test/pom.xml
@@ -5,11 +5,7 @@
     <parent>
         <groupId>com.whaleal.mars</groupId>
         <artifactId>mars</artifactId>
-<<<<<<< HEAD
         <version>0.8.72</version>
-=======
-        <version>0.8.84</version>
->>>>>>> b6a402ffba543f92805bbbc9124ce839c7cad06c
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -7,11 +7,7 @@
     <groupId>com.whaleal.mars</groupId>
     <artifactId>mars</artifactId>
     <packaging>pom</packaging>
-<<<<<<< HEAD
     <version>0.8.72</version>
-=======
-    <version>0.8.84</version>
->>>>>>> b6a402ffba543f92805bbbc9124ce839c7cad06c
     <name>Mars</name>
     <description>MongoDB driver framework</description>
     <!--我们项目的git地址-->