new conflict

2023-04-18 10:52:39 +03:00
parent 271715951d
commit 54b510cf34
2 changed files with 5 additions and 1 deletions
--- a/2
+++ b/2
@@ -11,7 +11,7 @@ main file code
 4
 3
 2
-1
+ooooo1
 er
 wt
 sg