33 added 33 --338883

2026-09-21 11:42:11 +03:00
1 changed files with 7 additions and 1 deletions
--- a/my3.txt
+++ b/my3.txt
@@ -2,5 +2,11 @@
 564
 45645
 6546
+<<<<<<< HEAD
 4564 vhjmkvghkm
-56546745674
+=======
+4564 vhjmkvghkm
+56546745674
+
+656564
+>>>>>>> fa4d567 (33 added 33 --338883)