222branch1

Merge branch 'main' of https://bdgit.educoder.net/w7eqrk98z/git-test1 into branch1
# Conflicts: # 1.txt
1 changed files with 1 additions and 4 deletions
--- a/1.txt
+++ b/1.txt
@ -1,5 +1,2 @@
-111master1333
-branch1
-branch2
-pull request
+111
 222
Author	SHA1	Message	Date
cxn	09e1530dba	222branch1	2 years ago
cxn	3677f2eaee	Merge branch 'main' of https://bdgit.educoder.net/w7eqrk98z/git-test1 into branch1 # Conflicts: # 1.txt	2 years ago
cxn	0d6cf7c914	23	2 years ago
cxn	95043f4983	branch1	2 years ago
cxn	217ed81600	Merge branch 'main' of https://bdgit.educoder.net/w7eqrk98z/git-test1 into branch1	2 years ago
cxn	db2d14bb53	2	2 years ago