From a0a0ea9104bcd29fb8e65038bdee99dab04cfbb6 Mon Sep 17 00:00:00 2001
From: lversaw <lversaw@noreply.door43.org>
Date: Sat, 17 Jun 2017 13:08:19 -0600
Subject: [PATCH] Sat Jun 17 2017 13:08:18 GMT-0600 (Mountain Daylight Time)

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

diff --git a/02/title.txt b/02/title.txt
index 12ce9c7..93943c4 100644
--- a/02/title.txt
+++ b/02/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Mateu 2
-=======
-Ikauhanyo 2
->>>>>>> 2f3ea4685169aa19be9783bc945df832669201be
+Ikauhanyo 2
\ No newline at end of file