From c1882d84fa679bdc98443b46130bb09a0f3e3ba4 Mon Sep 17 00:00:00 2001 From: lisl Date: Mon, 30 Sep 2024 10:37:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20Test.java=20=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 e3dbf38..6846c45 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_Conflict(){ - System.out.println("Test_Conflict"); + public static void Test_Conflict1(){ + System.out.println("Test_Conflict1"); } }