1 changed files with 0 additions and 7 deletions
--- a/111.txt
+++ b/111.txt
@ -1,8 +1 @@
 111
-<<<<<<< HEAD
-a_branch
-333
-
-=======
-develop
->>>>>>> 7326642851407636ef5415be3f0d3bf9db738300