Merge pull request 'test2' (#3 ) from master into main

Reviewed-on: #3
Merge pull request 'test' (#2 ) from master into main
2024-12-24 15:57:14 +04:00 · 2024-12-24 15:50:25 +04:00
1 changed files with 1 additions and 5 deletions
--- a/test.cpp
+++ b/test.cpp
@ -1,5 +1 @@
-<<<<<<< HEAD
-1111
-=======
 1111333333
->>>>>>> master
Author	SHA1	Message	Date
Filosof	0ff09ec6fd	Merge pull request 'test2' (#3 ) from master into main Reviewed-on: #3	2024-12-24 15:57:14 +04:00
Filosof	0d09d28613	Merge pull request 'test' (#2 ) from master into main Reviewed-on: #2	2024-12-24 15:50:25 +04:00