Merge pull request 'wbb' (#3) from wbb_branch into develop

2 years ago · 96374b3dd2
parent 5999b4d5b1 e2723b5f98
commit 96374b3dd2
3 changed files with 11 additions and 1 deletions
--- a/111.txt
+++ b/111.txt
@ -1,4 +1,8 @@
 111
+<<<<<<< HEAD
+111
+=======
 develop
 a_branch
-333
+333
+>>>>>>> 5999b4d5b1dac98d9eef1d4c1e81b54fba7821e8
--- a/doc/mll.txt
+++ b/doc/mll.txt
@ -2,6 +2,10 @@ HI
 <<<<<<< HEAD
 i'm mll
 =======
+<<<<<<< HEAD
+i'm mll
+=======
 i'm 20
 555
 >>>>>>> ac32a22c5b8ab370a60308df6a946006653a3dda
+>>>>>>> 5999b4d5b1dac98d9eef1d4c1e81b54fba7821e8
--- a/wbb666.txt
+++ b/wbb666.txt
@ -0,0 +1,2 @@
+wbb good and wonderful
+111