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

9 months ago · 8e6cf0b415
parent a9dee40c3f 46a5c17fd9
commit 8e6cf0b415
1 changed files with 1 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,4 +1,4 @@
-111
+222
 branch1
 branch2
 pull request