Merge branch 'main' of https://bdgit.educoder.net/p3jftc9gz/git-test

# Conflicts: # 1.txt
Merge branch 'branch1'
1 changed files with 2 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1 +1,2 @@
-111
+111
+branch1
Author	SHA1	Message	Date
王诗奇	8f4ec26030	Merge branch 'main' of https://bdgit.educoder.net/p3jftc9gz/git-test # Conflicts: # 1.txt	4 months ago
王诗奇	1396bc2aa5	Merge branch 'branch1' # Conflicts: # 1.txt	4 months ago
王诗奇	feae6ee8aa	111 branch1	4 months ago
王诗奇	ac523b5409	Merge branch 'branch1' # Conflicts: # 1.txt	4 months ago
王诗奇	505241486d	branch1	4 months ago
王诗奇	2dbf5160c5	111	4 months ago
王诗奇	387e21f151	111	4 months ago