Merge branch 'conflict'

Update Text Document.txt
2023-10-25 00:03:14 +04:00 · 2023-10-24 23:56:47 +04:00
1 changed files with 3 additions and 1 deletions
--- a/Document.txt
+++ b/Document.txt
@ -1 +1,3 @@
 "все-таки лаба4"
Author	SHA1	Message	Date
aaahsap	70733be8bd	Merge branch 'conflict'	2023-10-25 00:03:14 +04:00
aaahsap	ac893b2f7c	Update Text Document.txt	2023-10-24 23:56:47 +04:00