Merge pull request 'pull request conflict' (#2 ) from branch2 into develop

222
Merge branch 'main' of https://bdgit.educoder.net/parfwmzbj/git-test into develop
1 changed files with 3 additions and 2 deletions
--- a/1.txt
+++ b/1.txt
@ -1,4 +1,5 @@
-111
+222
 branch1
 branch2
-pull request
+pull request
 develope
Author	SHA1	Message	Date
parfwmzbj	8e6cf0b415	Merge pull request 'pull request conflict' (#2 ) from branch2 into develop	4 months ago
Lastw	46a5c17fd9	222	4 months ago
Lastw	a9dee40c3f	Merge branch 'main' of https://bdgit.educoder.net/parfwmzbj/git-test into develop # Conflicts: # 1.txt	4 months ago
Lastw	fb455f57e7	develope	4 months ago