Merge pull request 'new conflict' (#2) from testing2/repo-forking-test:feat2 into master

Reviewed-on: dymik739/repo-forking-test#2
2023-04-18 10:57:37 +03:00 · 2023-04-18 10:57:37 +03:00 · 39ca87e5d1
parent 95dc480e67 3965017c8a
commit 39ca87e5d1
2 changed files with 5 additions and 1 deletions
--- a/2
+++ b/2
@ -11,7 +11,7 @@ main file code
 4
 3
 2
-1
+ooooo1
 er
 wt
 sg
--- a/4
+++ b/4
@ -0,0 +1,4 @@
 r
 r
 r
 r