Merge branch 'master' into feat2

new conflict
2023-04-18 10:56:55 +03:00 · 2023-04-18 10:52:39 +03:00
2 changed files with 5 additions and 1 deletions
@@ -11,7 +11,7 @@ main file code
 4
 3
 2
-1
+ooooo1
 er
 wt
 sg
@@ -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
testing2	54b510cf34	new conflict	2023-04-18 10:52:39 +03:00