1 changed files with 1 additions and 5 deletions
--- a/1.txt
+++ b/1.txt
@ -1,6 +1,2 @@
 <<<<<<< HEAD
 text1
 =======
 test
 branch1
 >>>>>>> branch1