Merge branch 'dev' of https://bdgit.educoder.net/pzo9jb4e6/gitProject into zyf_branch

# Conflicts: # doc/1111.txt
3 years ago · 50ad13da89
parent 59edb76bb1 6ff2c64876
commit 50ad13da89
1 changed files with 6 additions and 1 deletions
--- a/doc/1111.txt
+++ b/doc/1111.txt
@ -1,3 +1,8 @@
 1111
+<<<<<<< HEAD
 22
-5555
+5555
+=======
+3333
+4444
+>>>>>>> 6ff2c6487638411e964f63aefe8be6c2c40a0946