Merge branch 'main' of https://bdgit.educoder.net/p9uf6a8lw/Git_chengyihui

Merge branch 'chengyihui_branch'
# Conflicts: # doc/1.txt
1 changed files with 1 additions and 1 deletions
--- a/doc/1.txt
+++ b/doc/1.txt
@ -1 +1 @@
-test branch1
+test main1test branch1
Author	SHA1	Message	Date
程毅辉	9df376174d	Merge branch 'main' of https://bdgit.educoder.net/p9uf6a8lw/Git_chengyihui	2 years ago
程毅辉	67e202cb6a	Merge branch 'chengyihui_branch' # Conflicts: # doc/1.txt	2 years ago
程毅辉	7d76ab7c3a	1	2 years ago
p9uf6a8lw	7bf164acad	1 1	2 years ago