From b8717155a64b897b0ed7f3b8756bd4190cbfa112 Mon Sep 17 00:00:00 2001
From: yustius <yustius@noreply.door43.org>
Date: Mon, 17 Sep 2018 04:52:52 +0700
Subject: [PATCH] Mon Sep 17 2018 04:52:51 GMT+0700 (SE Asia Standard Time)

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

diff --git a/20/title.txt b/20/title.txt
index ea56cf2d..4cb73c66 100644
--- a/20/title.txt
+++ b/20/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Pasal 20
-=======
-Teng Makedonia ka Troas
->>>>>>> d63f071674fad73bbcb9215104f9073cb2e819c8
+Pasal 20
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index bd97af04..20be5768 100644
--- a/manifest.json
+++ b/manifest.json
@@ -358,6 +358,7 @@
 		"20-31",
 		"20-33",
 		"20-36",
+		"20-title",
 		"21-01",
 		"21-03",
 		"21-05",