Merge branch 'main' of https://bdgit.educoder.net/pcv5zkunm/class_16

2 years ago · 783253bdac
parent 3b28a37ac9 5474f40471
commit 783253bdac
2 changed files with 5 additions and 8 deletions
--- a/1.txt
+++ b/1.txt
@ -1,7 +0,0 @@
-<<<<<<< HEAD
-branch1
-=======
-陈帅666
-gwx99
-branch_g
->>>>>>> remotes/origin/main
--- a/1.txt.txt
+++ b/1.txt.txt
@ -1 +1,5 @@
-111
+111
+branch_hjj
+gwx_work
+pull_request_gwx
+yqy_conduct