mll.txt

111
4 changed files with 2 additions and 9 deletions
--- a/111.txt
+++ b/111.txt
@ -1,2 +1,2 @@
 111
-develop
+111
--- a/doc/mll.txt
+++ b/doc/mll.txt
@ -1,7 +1,2 @@
 HI
-<<<<<<< HEAD
 i'm mll
-=======
-i'm 20
-555
->>>>>>> ac32a22c5b8ab370a60308df6a946006653a3dda
--- a/scr/scr.txt
+++ b/scr/scr.txt
@ -1 +0,0 @@
-NOTHING
--- a/src/src.txt
+++ b/src/src.txt
@ -1 +0,0 @@
-NOTHING
Author	SHA1	Message	Date
pmgzcvlfn	eaca193c87	mll.txt	3 years ago
pmgzcvlfn	91b9994fab	111	3 years ago