new conflict

resolved merging conflict
new feature 1
2023-04-18 10:52:39 +03:00 · 2023-04-18 09:14:23 +03:00 · 2023-04-18 08:57:42 +03:00
2 changed files with 10 additions and 1 deletions
--- a/7
+++ b/7
@ -11,8 +11,13 @@ main file code
 4
 3
 2
-1
+ooooo1
 er
 wt
 sg
 xb
 10
 12
 13
 14
 15
--- a/4
+++ b/4
@ -0,0 +1,4 @@
 r
 r
 r
 r
Author	SHA1	Message	Date
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	058944edc7	new feature 1	2023-04-18 08:57:42 +03:00