From 745001f6af5b307e6ae51584ec20b3783159afde Mon Sep 17 00:00:00 2001
From: Titus <you@example.com>
Date: Wed, 4 Mar 2020 09:46:11 +1100
Subject: [PATCH] Wed Mar 04 2020 09:46:10 GMT+1100 (Central Pacific Standard
 Time)

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

diff --git a/front/title.txt b/front/title.txt
index 34b55e5..b6b100b 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-EFESUS
-=======
-efesus
->>>>>>> 9c5c650e8c100933d7784f05d5ff57bb0b7904ea
+efesus
\ No newline at end of file