4 changed files with 0 additions and 15 deletions
--- a/1.txt
+++ b/1.txt
@ -1,6 +0,0 @@
-<<<<<<< HEAD
-111
-branch1
-=======
-111
->>>>>>> c00de31092a7080c232bf18df5101a99e9f0c791
--- a/README.md
+++ b/README.md
@ -1,10 +1,2 @@
 # git-test

-main修改
-
-
-branch修改
-
-main第二次修改
-
-
--- a/doc/软件需求规格说明书.doc
+++ b/doc/软件需求规格说明书.doc
--- a/src/1.txt
+++ b/src/1.txt
@ -1 +0,0 @@
-main内容