111

test2
2024-12-24 16:21:18 +04:00 · 2024-12-24 15:54:41 +04:00
1 changed files with 5 additions and 1 deletions
--- a/test.cpp
+++ b/test.cpp
@ -1 +1,5 @@
-1111
+<<<<<<< HEAD
+1111
+=======
+1111333333
+>>>>>>> master
Author	SHA1	Message	Date
d.yarmukhin	ace99fa93d	111	2024-12-24 16:21:18 +04:00
d.yarmukhin	c1b35626bd	test2	2024-12-24 15:54:41 +04:00