From 77b143936b94df570c819534ba969700b629de38 Mon Sep 17 00:00:00 2001
From: lisl <lisl@connor.net.cn>
Date: Mon, 30 Sep 2024 11:18:47 +0800
Subject: [PATCH] test pull

---
 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 6846c45..3f6eeb4 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_Conflict1(){
-    	System.out.println("Test_Conflict1");
+    public static void  Test_Conflict12(){
+    	System.out.println("Test_Conflict12");
     }
 }