Tue Sep 15 2020 21:33:27 GMT-0700 (Pacific Daylight Time)

05/20.txt

@@ -0,0 +1,2 @@
+20Dan, kito panai bahwa anak Allah udoh datang dan udoh moik pengertian ke kito sak kito dapat mengenal Io yg bena; dan kito ado di dalam Io yang bena, dalam Anak-Nya, Yesus Kristus. Io aem Allah yang bena dan idop yang kekal.
+21 Anak-anakku,jauhkan deik ken dai'i berhala-berhala.

LICENSE.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 # License
 ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
@@ -25,3 +26,10 @@ The licensor cannot revoke these freedoms as long as you follow the license term
 You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
 
 No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
+=======
+# License
+
+This work is made available under the Creative Commons Attribution-ShareAlike 4.0 International License (CC BY-SA). To view a copy of this license, visit [http://creativecommons.org/licenses/by-sa/4.0/](http://creativecommons.org/licenses/by-sa/4.0/) or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+
+If you would like to notify unfoldingWord regarding your translation of this work, please contact us at [https://unfoldingword.org/contact/](https://unfoldingword.org/contact/).
+>>>>>>> 664c4a1205ec20d5d1e2cf2076533099bd154746

manifest.json

@@ -32,7 +32,8 @@
 	],
 	"translators": [
 		"normiyati",
-		"dayakpapak"
+		"dayakpapak",
+		"Eka Sri Juliana"
 	],
 	"finished_chunks": [
 		"front-title",
@@ -80,6 +81,7 @@
 		"05-11",
 		"05-13",
 		"05-16",
-		"05-18"
+		"05-18",
+		"05-20"
 	]
 }