mengliling_branch

2 years ago · 67e2bd3f7b
parent ac32a22c5b 4916a8b25c
commit 67e2bd3f7b
2 changed files with 6 additions and 1 deletions
--- a/doc/mll.txt
+++ b/doc/mll.txt
@ -1,3 +1,7 @@
 HI
+<<<<<<< HEAD
+i'm mll
+=======
 i'm 20
-555
+555
+>>>>>>> ac32a22c5b8ab370a60308df6a946006653a3dda
--- a/scr/scr.txt
+++ b/scr/scr.txt
@ -0,0 +1 @@
+NOTHING