b2

Merge branch 'develop' of https://bdgit.educoder.net/p68123740/git-test into branch2
# Conflicts: # 1.txt
1 changed files with 3 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,3 +1,5 @@
 111
 333
-develop
+branch
+develop
+444
Author	SHA1	Message	Date
p68123740	bfe1312e9c	b2	7 months ago
luyao	3c62c7e85d	Merge branch 'develop' of https://bdgit.educoder.net/p68123740/git-test into branch2 # Conflicts: # 1.txt	7 months ago
luyao	cfbb2a3d6f	b2	7 months ago
luyao	ee16035876	branch2	7 months ago
luyao	706ff92e50	Merge branch 'main' of https://bdgit.educoder.net/p68123740/git-test into branch2 # Conflicts: # 1.txt	7 months ago
luyao	0c50267dce	branch2	7 months ago
luyao	5bdfbd8d66	Merge branch 'main' of https://bdgit.educoder.net/p68123740/git-test into branch2 # Conflicts: # 1.txt	7 months ago
luyao	a5dfd80451	222	7 months ago