3 changed files with 0 additions and 15 deletions
--- a/branch1.txt
+++ b/branch1.txt
@ -1,8 +0,0 @@
-branch1
-<<<<<<< HEAD
-master1
-=======
-第二次修改branch1
->>>>>>> branch1
-
-第三次修改
--- a/java.java
+++ b/java.java
@ -1,5 +0,0 @@
-public class HelloWorld {
-    public static void main(String[] args) {
-        System.out.println("Hello, World!");
-    }
-}
--- a/test.py
+++ b/test.py
@ -1,2 +0,0 @@
-print('Hellow world！')
-print('Hellow git！')