5 changed files with 2 additions and 21 deletions
--- a/111.txt
+++ b/111.txt
@ -1,8 +1,2 @@
 111
-<<<<<<< HEAD
-111
-=======
-develop
-a_branch
-333
->>>>>>> 5999b4d5b1dac98d9eef1d4c1e81b54fba7821e8
+111
--- a/doc/mll.txt
+++ b/doc/mll.txt
@ -1,11 +1,2 @@
 HI
-<<<<<<< HEAD
-i'm mll
-=======
-<<<<<<< HEAD
-i'm mll
-=======
-i'm 20
-555
->>>>>>> ac32a22c5b8ab370a60308df6a946006653a3dda
->>>>>>> 5999b4d5b1dac98d9eef1d4c1e81b54fba7821e8
+i'm mll
--- a/scr/scr.txt
+++ b/scr/scr.txt
@ -1 +0,0 @@
-NOTHING
--- a/src/src.txt
+++ b/src/src.txt
@ -1 +0,0 @@
-NOTHING
--- a/wbb666.txt
+++ b/wbb666.txt
@ -1,2 +0,0 @@
-wbb good and wonderful
-111