a_branch

Merge branch 'develop' of https://bdgit.educoder.net/pkqzrh3pa/git-test1 into a_branch
1 changed files with 3 additions and 1 deletions
--- a/111.txt
+++ b/111.txt
@ -1 +1,3 @@
-111
+111
+a_branch
+develop333
Author	SHA1	Message	Date
pkqzrh3pa	6c0f1a8c93	a_branch a_branch	3 years ago
day	0496724194	Merge branch 'develop' of https://bdgit.educoder.net/pkqzrh3pa/git-test1 into a_branch # Conflicts: # 111.txt	3 years ago
day	c72c55f104	a_branch	3 years ago
day	82e9d25ffb	develop	3 years ago