33 added 33 --338883

33 added 33 --333
2026-09-21 11:42:11 +03:00 · 2026-09-21 11:37:06 +03:00
2 changed files with 9 additions and 5 deletions
--- a/my2.txt
+++ b/my2.txt
@@ -1,3 +1,2 @@
 dgfbhndgfb
-dfgdf 567856756 g
+gfhsx6456546
 fhsx6456546
--- a/my3.txt
+++ b/my3.txt
@@ -2,6 +2,11 @@
 564
 45645
 6546
-4564
+<<<<<<< HEAD
-dfhdfdh
+4564 vhjmkvghkm
-dfhdfh dhdhnmddm
+=======
 4564 vhjmkvghkm
 56546745674
 656564
 >>>>>>> fa4d567 (33 added 33 --338883)
Author	SHA1	Message	Date
SergeyAlex	524fe37b7d	33 added 33 --338883	2026-09-21 11:42:11 +03:00
SergeyAlex	48ea4bbc6f	33 added 33 --333	2026-09-21 11:37:06 +03:00