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

# Conflicts: # 111.txt # doc/mll.txt
2 years ago · e2723b5f98
parent 4d77d92854 5999b4d5b1
commit e2723b5f98
4 changed files with 19 additions and 2 deletions
--- a/111.txt
+++ b/111.txt
@ -1,2 +1,8 @@
 111
-111
+<<<<<<< HEAD
+111
+=======
+develop
+a_branch
+333
+>>>>>>> 5999b4d5b1dac98d9eef1d4c1e81b54fba7821e8
--- a/doc/mll.txt
+++ b/doc/mll.txt
@ -1,2 +1,11 @@
 HI
-i'm mll
+<<<<<<< HEAD
+i'm mll
+=======
+<<<<<<< HEAD
+i'm mll
+=======
+i'm 20
+555
+>>>>>>> ac32a22c5b8ab370a60308df6a946006653a3dda
+>>>>>>> 5999b4d5b1dac98d9eef1d4c1e81b54fba7821e8
--- a/scr/scr.txt
+++ b/scr/scr.txt
@ -0,0 +1 @@
+NOTHING
--- a/src/src.txt
+++ b/src/src.txt
@ -0,0 +1 @@
+NOTHING