Merge remote-tracking branch 'remotes/origin/main'

# Conflicts: # 1.txt
branch1
1 changed files with 5 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,3 +1,7 @@
+<<<<<<< HEAD
+branch1
+=======
 陈帅666
 gwx99
-branch_g
+branch_g
+>>>>>>> remotes/origin/main
Author	SHA1	Message	Date
徐洁	c2ebf42a40	Merge remote-tracking branch 'remotes/origin/main' # Conflicts: # 1.txt	2 years ago
徐洁	5bb3723502	branch1	2 years ago