From 16a59069fdd818bc93480ca7597d62e117ccf61e Mon Sep 17 00:00:00 2001
From: Angelov <alll>
Date: Mon, 25 Sep 2023 18:28:17 +0300
Subject: [PATCH] text4

---
 text.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/text.txt b/text.txt
index 6013629..ea70dea 100644
--- a/text.txt
+++ b/text.txt
@@ -1,3 +1,10 @@
+<<<<<<< HEAD
 string1!
 string2!
-string3!
\ No newline at end of file
+string3!
+=======
+string1
+string2
+string3
+string4
+>>>>>>> text4