brrrrr

Merge pull request 'new conflict' (#2 ) from testing2/repo-forking-test:feat2 into master
Reviewed-on: dymik739/repo-forking-test#2
2023-04-18 11:02:18 +03:00 · 2023-04-18 10:57:37 +03:00 · 2023-04-18 10:56:55 +03:00 · 2023-04-18 10:52:39 +03:00
2 changed files with 9 additions and 5 deletions
--- a/10
+++ b/10
@ -11,7 +11,7 @@ main file code
 4
 3
 2
-1
+ooooo1
 er
 wt
 sg
@ -22,7 +22,7 @@ xb
 14
 15
 hello
-1
+1222
-2
+2222
-2
+2222
-3
+3222
--- a/4
+++ b/4
@ -0,0 +1,4 @@
 r
 r
 r
 r
Author	SHA1	Message	Date
testing2	d9ec741c76	brrrrr	2023-04-18 11:02:18 +03:00
dymik739	39ca87e5d1	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
testing2	3965017c8a	Merge branch 'master' into feat2	2023-04-18 10:56:55 +03:00
testing2	54b510cf34	new conflict	2023-04-18 10:52:39 +03:00
+ooooo1
 er
 wt
 sg
 hello