Merge branch 'main' of https://bdgit.educoder.net/p4gikqjzc/cwh_Git-test

冲突
1 changed files with 1 additions and 6 deletions
--- a/1.txt
+++ b/1.txt
@ -1,10 +1,5 @@
 2067809724
 branch1
 branch2
-
-pull request
-问题
-
 产生冲突
-冲突
-
+冲突
Author	SHA1	Message	Date
chenwenhui111	7c87ac8398	Merge branch 'main' of https://bdgit.educoder.net/p4gikqjzc/cwh_Git-test	4 weeks ago
chenwenhui111	e2f2e78356	冲突	4 weeks ago