From ad9af488a1627f692c37dee212fc54d0a288039c Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Fri, 24 Sep 2021 06:29:02 -0700
Subject: [PATCH] Fri Sep 24 2021 06:29:02 GMT-0700 (Pacific Daylight Time)

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

diff --git a/front/title.txt b/front/title.txt
index ed6d0fe..ba6ac06 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Yohanna 1
-=======
-1Yohanna
->>>>>>> a9145faac24c5433daedc878bfbe2a0eba34ef9c
+1Yohanna
\ No newline at end of file