From 870aa08386bfa171e45d5bf03b2b1ac8c6b07659 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Mon, 20 Jul 2020 11:14:43 +0200
Subject: [PATCH] Mon Jul 20 2020 11:14:41 GMT+0200 (South Africa Standard
 Time)

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

diff --git a/front/title.txt b/front/title.txt
index a74b709..d68311f 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Johane
-=======
-Johane umbhabhatisi
->>>>>>> 192c7ec6153eab78ae98e152bd2a4579e2a1487d
+Johane
\ No newline at end of file