From fb3be0fe0af7a49b128d943b51c7e8e40869a86a Mon Sep 17 00:00:00 2001
From: zhangzetian <zhangzetian@kanzhun.com>
Date: Wed, 6 Apr 2022 14:29:38 +0800
Subject: [PATCH 1/3] updating poms for 0.0.10-SNAPSHOT development

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 806183a..732e78c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
-	<version>0.0.9-SNAPSHOT</version>
+	<version>0.0.10-SNAPSHOT</version>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-- 
Gitee


From ed3545a7fb736204d0213202a196a28870820a3c Mon Sep 17 00:00:00 2001
From: zhangzetian <zhangzetian@kanzhun.com>
Date: Wed, 6 Apr 2022 14:29:48 +0800
Subject: [PATCH 2/3] updating develop poms to master versions to avoid merge
 conflicts

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 732e78c..0fb4b89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
-	<version>0.0.10-SNAPSHOT</version>
+	<version>0.0.9</version>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-- 
Gitee


From 5af57ed83e29ec51b61fd34bd6bc11806744d97a Mon Sep 17 00:00:00 2001
From: zhangzetian <zhangzetian@kanzhun.com>
Date: Wed, 6 Apr 2022 14:29:48 +0800
Subject: [PATCH 3/3] Updating develop poms back to pre merge state

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0fb4b89..732e78c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
-	<version>0.0.9</version>
+	<version>0.0.10-SNAPSHOT</version>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-- 
Gitee