Merge branch 'main' of https://bdgit.educoder.net/p82feo7wg/git-test into zhangsan_branch

# Conflicts: # hello word.txt
2 months ago · 70b1d29496
parent 81c5c82cd7 ad60a274c3
commit 70b1d29496
1 changed files with 2 additions and 6 deletions
--- a/word.txt
+++ b/word.txt
@ -1,7 +1,3 @@
-嗨嗨嗨，来啦
 123
-好玩
-91钟凯
-92
-解决
-不解决
+456
+777