Merge branch 'develop' of https://bdgit.educoder.net/pmgzcvlfn/mll_git into mengliling_branch

# Conflicts: # doc/mll.txt
2 years ago · 4916a8b25c
parent 9f99c9d970 ac32a22c5b
commit 4916a8b25c
3 changed files with 9 additions and 2 deletions
--- a/111.txt
+++ b/111.txt
@ -1 +1,2 @@
-111
+111
+develop
--- a/doc/mll.txt
+++ b/doc/mll.txt
@ -1,2 +1,7 @@
 HI
-i'm mll
+<<<<<<< HEAD
+i'm mll
+=======
+i'm 20
+555
+>>>>>>> ac32a22c5b8ab370a60308df6a946006653a3dda
--- a/src/src.txt
+++ b/src/src.txt
@ -0,0 +1 @@
+NOTHING