Wed Aug 14 2019 18:08:01 GMT+0700 (SE Asia Standard Time)

2019-08-14 18:08:02 +07:00 · 2019-08-14 18:08:02 +07:00 · 6bc8a34a11
parent 09e5ab87a6
commit 6bc8a34a11
2 changed files with 2 additions and 5 deletions
--- 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.
--- a/manifest.json
+++ b/manifest.json
@ -548,6 +548,7 @@
 		"24-28",
 		"24-30",
 		"24-33",
+		"24-36",
 		"24-38",
 		"24-41",
 		"24-44",