fix: merge error

flowerfine · Nov 29, 2024 · e39c21e · e39c21e
1 parent 0e41608
commit e39c21e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/milky-concurrent/milky-concurrent-future/pom.xml b/milky-concurrent/milky-concurrent-future/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>milky-concurrent</artifactId>
-        <version>1.0.14-SNAPSHOT</version>
+        <version>1.0.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>milky-concurrent-future</artifactId>

diff --git a/milky-concurrent/milky-concurrent-thread/pom.xml b/milky-concurrent/milky-concurrent-thread/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>milky-concurrent</artifactId>
-        <version>1.0.14-SNAPSHOT</version>
+        <version>1.0.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>milky-concurrent-thread</artifactId>

diff --git a/milky-concurrent/pom.xml b/milky-concurrent/pom.xml
@@ -11,7 +11,6 @@
     </parent>
     <artifactId>milky-concurrent</artifactId>
     <packaging>pom</packaging>
-    <name>${project.artifactId}</name>
 
     <modules>
         <module>milky-concurrent-thread</module>