1 changed files with 1 additions and 5 deletions
--- a/1.txt
+++ b/1.txt
@ -1,7 +1,3 @@
-<<<<<<< HEAD
-branch1
-=======
 陈帅666
 gwx99
 branch_g
->>>>>>> remotes/origin/main