test pull

解决 Test.java 合并冲突
1 changed files with 2 additions and 2 deletions
--- 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_Conflict12(){
+    	System.out.println("Test_Conflict12");
    }
 }
Author	SHA1	Message	Date
李双龙	77b143936b	test pull	9 months ago
李双龙	c1882d84fa	解决 Test.java 合并冲突	9 months ago