From e39c21ef6902b5c09c2744f5ca2b0e623d809ccb Mon Sep 17 00:00:00 2001
From: wangqi <1942460489@qq.com>
Date: Sat, 30 Nov 2024 00:33:20 +0800
Subject: [PATCH] fix: merge error

---
 milky-concurrent/milky-concurrent-future/pom.xml | 2 +-
 milky-concurrent/milky-concurrent-thread/pom.xml | 2 +-
 milky-concurrent/pom.xml                         | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/milky-concurrent/milky-concurrent-future/pom.xml b/milky-concurrent/milky-concurrent-future/pom.xml
index 71f5a89..b3e3a6d 100644
--- 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
index c339e87..ffb86d7 100644
--- 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
index 1cfd96e..5043d1f 100644
--- 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>