Save conflicts

2025-11-25 12:05:07 +03:00
parent aee2a5dcab e1acba5589
commit 4de6ab8105
1 changed files with 11 additions and 0 deletions
--- a/test.txt
+++ b/test.txt
@@ -1,4 +1,5 @@
 10
 <<<<<<< HEAD
 20
 30
 40
@@ -7,4 +8,14 @@
 77
 88
 90
 =======
 21
 31
 41
 51
 61
 71
 81
 91
 >>>>>>> master
 00