Merge branch 'main' into chenwenhui_branch1

# Conflicts: # 1.txt
问题
1 changed files with 6 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,5 +1,10 @@
 2067809724
 branch1
 branch2
+
+pull request
+问题
+
 产生冲突
-冲突
+冲突
+
Author	SHA1	Message	Date
chenwenhui111	2323c962c2	Merge branch 'main' into chenwenhui_branch1 # Conflicts: # 1.txt	4 weeks ago
chenwenhui111	760e15d28f	问题	4 weeks ago
chenwenhui111	5061d26532	pull	4 weeks ago