33 added 33 --338883

2026-09-21 11:39:15 +03:00
parent 48ea4bbc6f
commit 524fe37b7d
1 changed files with 8 additions and 1 deletions
--- a/my3.txt
+++ b/my3.txt
@@ -2,4 +2,11 @@
 564
 45645
 6546
-4564 vhjmkvghkm
+<<<<<<< HEAD
+4564 vhjmkvghkm
+=======
+4564 vhjmkvghkm
+56546745674
+
+656564
+>>>>>>> fa4d567 (33 added 33 --338883)