From d319d4237137cf5ef2704f8efcb8c4a5e5bfc876 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Sun, 18 Nov 2018 21:42:08 +1000
Subject: [PATCH] Sun Nov 18 2018 21:42:07 GMT+1000 (West Pacific Standard
 Time)

---
 03/title.txt  | 6 +-----
 manifest.json | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/03/title.txt b/03/title.txt
index 4103703..33551c1 100644
--- a/03/title.txt
+++ b/03/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Áanaima 3
-=======
-Áaimma
->>>>>>> 1e932c8d66e9680a4ac6feb3f51e3f93177a1d65
+Áanaima 3
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index b3a9a84..12a9084 100644
--- a/manifest.json
+++ b/manifest.json
@@ -56,6 +56,7 @@
 		"02-13",
 		"02-14",
 		"02-17",
+		"03-title",
 		"03-01",
 		"03-04",
 		"03-06",