Merge branch 'master' of https://bdgit.educoder.net/pah5rctm2/zjf_Gitstudy

# Conflicts: # newfile2.txt
2 years ago · b407382827
parent 25e6b6bba1 53ae6021d8
commit b407382827
1 changed files with 4 additions and 0 deletions
--- a/newfile2.txt
+++ b/newfile2.txt
@ -1,2 +1,6 @@
 new file2
+<<<<<<< HEAD
 uuuuuuuu
+=======
+wwwwwwww
+>>>>>>> 53ae6021d868f894eecda7cc3f547533910ccbf8