6 Commits

Author SHA1 Message Date
testing2 7df6bfedc2 sync commits for pull request 2023-04-18 11:17:31 +03:00
dymik739 4def0d6e40 ennene 2023-04-18 11:02:49 +03:00
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
dymik739 95dc480e67 usual commit 2023-04-18 10:53:33 +03:00
+5
View File
@@ -21,3 +21,8 @@ xb
13 13
14 14
15 15
hello
1222
2222
2222
3222