From 942352a8422e01d76f23ca471464be1f14cadb0d Mon Sep 17 00:00:00 2001
From: MaxTJ <maxtj@noreply.door43.org>
Date: Mon, 26 Jul 2021 15:12:26 +0500
Subject: [PATCH] Mon Jul 26 2021 15:12:26 GMT+0500 (Tajikistan Time)

---
 10/03.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/10/03.txt b/10/03.txt
index 8d41f48d..5e89ff08 100644
--- a/10/03.txt
+++ b/10/03.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Sipt'andel sasceli eygeti iq'o: Ğmertma Nili x'evis s'q'ali sisxlad gadaktsiva. Magram paraonma ar govşo İsraili xalği.
-=======
-S
->>>>>>> c5418ca69dbb6aac2a4404c33da5db54fe8aef3b
+Sipt'andel sasceli eygeti iq'o: Ğmertma Nili x'evis s'q'ali sisxlad gadaktsiva. Magram paraonma ar govşo İsraili xalği.
\ No newline at end of file