From 292f4eccfce080c215ece63254cd4cc93f2f1feb Mon Sep 17 00:00:00 2001
From: lisl <lisl@connor.net.cn>
Date: Sun, 29 Sep 2024 16:54:05 +0800
Subject: [PATCH] Test_Conflict

---
 src/gitTest/Test.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gitTest/Test.java b/src/gitTest/Test.java
index aaea06b..e3dbf38 100644
--- a/src/gitTest/Test.java
+++ b/src/gitTest/Test.java
@@ -40,7 +40,7 @@ public class Test {
     public static void  Test_stage2(){
     	System.out.println("Test_stage2");
     }
-    public static void  Test_stage3(){
-    	System.out.println("Test_stage3");
+    public static void  Test_Conflict(){
+    	System.out.println("Test_Conflict");
     }
 }