From e6a9edfa00bf7639bd1986e65e126736fb8b6c98 Mon Sep 17 00:00:00 2001
From: joeg <joeg@noreply.door43.org>
Date: Fri, 22 Jun 2018 03:59:32 -0400
Subject: [PATCH] Fri Jun 22 2018 03:59:32 GMT-0400 (Eastern Daylight Time)

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

diff --git a/04/title.txt b/04/title.txt
index e4f9a2da..41a69bde 100644
--- a/04/title.txt
+++ b/04/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Anafim 4
-=======
-Maki 3 anafim
->>>>>>> 8e6c6587bdfec5875715d591f60e64b9c649c888
+Anafim 4
\ No newline at end of file