From 6bc8a34a1132b6dfc8696103ce15e808b823774c Mon Sep 17 00:00:00 2001
From: suhartono <suhartono@noreply.door43.org>
Date: Wed, 14 Aug 2019 18:08:02 +0700
Subject: [PATCH] Wed Aug 14 2019 18:08:01 GMT+0700 (SE Asia Standard Time)

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

diff --git a/24/36.txt b/24/36.txt
index 6e881ba..7289341 100644
--- a/24/36.txt
+++ b/24/36.txt
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 \v 36 Lebuh seduai iya benung nusui nya, Jesus Empu lalu tekala nya bediri ba tengah-tengah sida, lalu bejaku ngagai sida, “Awakka pemaik meruan enggau kita.”
 
-\v 37 Tang sida tekenyit sereta balat takut, lalu ngumbai diri meda antu.
-=======
-b
->>>>>>> 8acf4137d02978b613af37f85137a04dc7c74998
+ \v 37 Tang sida tekenyit sereta balat takut, lalu ngumbai diri meda antu.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 238f348..4b7dbea 100644
--- a/manifest.json
+++ b/manifest.json
@@ -548,6 +548,7 @@
 		"24-28",
 		"24-30",
 		"24-33",
+		"24-36",
 		"24-38",
 		"24-41",
 		"24-44",