ennene

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:49 +03:00 · 2023-04-18 10:57:37 +03:00
1 changed files with 3 additions and 3 deletions
--- a/6
+++ b/6
@@ -22,7 +22,7 @@ xb
 14
 15
 hello
-1
-2
-2
+1777
+2777
+2777
 3
Author	SHA1	Message	Date
dymik739	4def0d6e40	ennene	2023-04-18 11:02:49 +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