Merge branch 'master' into feat2

usual commit
new conflict
2023-04-18 10:56:55 +03:00 · 2023-04-18 10:53:33 +03:00 · 2023-04-18 10:52:39 +03:00 · 2023-04-18 09:14:23 +03:00 · 2023-04-18 08:44:31 +03:00
2 changed files with 14 additions and 1 deletions
--- a/11
+++ b/11
@@ -11,9 +11,18 @@ main file code
 4
 3
 2
-1
+ooooo1
 er
 wt
 sg
 xb
 10
 12
 13
 14
 15
 hello
 1
 2
 2
 3
--- a/4
+++ b/4
@@ -0,0 +1,4 @@
 r
 r
 r
 r
Author	SHA1	Message	Date
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
testing2	54b510cf34	new conflict	2023-04-18 10:52:39 +03:00
dymik739	271715951d	resolved merging conflict	2023-04-18 09:14:23 +03:00
dymik739	95476bab77	add some code	2023-04-18 08:44:31 +03:00
+ooooo1
+er
+wt
+sg
+xb
+hello