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

3 years ago · cbb35cd839
parent 76cae6e0a8 1faf6c02d2
commit cbb35cd839
1 changed files with 1 additions and 3 deletions
--- a/newfile2.txt
+++ b/newfile2.txt
@ -1,6 +1,4 @@
 new file2
-<<<<<<< HEAD
 uuuuuuuu
-=======
 wwwwwwww
->>>>>>> 53ae6021d868f894eecda7cc3f547533910ccbf8
+