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

# Conflicts: # doc/mll.txt
old
4 changed files with 11 additions and 1 deletions
--- a/111.txt
+++ b/111.txt
@ -1 +1,2 @@
-111
+111
+develop
--- a/doc/mll.txt
+++ b/doc/mll.txt
@ -0,0 +1,7 @@
+HI
+<<<<<<< HEAD
+i'm mll
+=======
+i'm 20
+555
+>>>>>>> ac32a22c5b8ab370a60308df6a946006653a3dda
--- a/scr/scr.txt
+++ b/scr/scr.txt
@ -0,0 +1 @@
+NOTHING
--- a/src/src.txt
+++ b/src/src.txt
@ -0,0 +1 @@
+NOTHING
Author	SHA1	Message	Date
pmgzcvlfn	4916a8b25c	Merge branch 'develop' of https://bdgit.educoder.net/pmgzcvlfn/mll_git into mengliling_branch # Conflicts: # doc/mll.txt	3 years ago
pmgzcvlfn	ac32a22c5b	old	3 years ago
pmgzcvlfn	9f99c9d970	mll	3 years ago
pmgzcvlfn	1cfe9e2b00	mll.txt	3 years ago
pmgzcvlfn	1eba106a08	mll.txt	3 years ago
pmgzcvlfn	9b4a045e27	develop	3 years ago