1 changed files with 1 additions and 5 deletions
--- a/git.txt
+++ b/git.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-1版本
-=======
-2版本
->>>>>>> 2_branch
+123456