Sat Jan 15 2022 00:28:22 GMT-0800 (Pacific Standard Time)

01/01.txt

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 Prenat Honis
-\v 1 Sa'sa he mui nain et eti unu, he haim nen maneji, fun hai he mitmaneji hai miten nok hai matan, fun sa'sa he haim sak'si mam'botbeo
+\v 1 Sa'sa he mui nain et eti unu, he haim nen maneji, fun hai he mitmaneji hai miten nok hai matan, fun sa'sa he haim sak'si mam'botbeo
+=======
+Prenat Honis \v 1 sa sa he mui nain et eti unu, he haim nen maneji, he haim miten nok haimatan, fun sa sa he haim saksi mambotbeo ge ji fin haim reoge nok hai nimmi ji an tom neu kabin honis abar-barat he nani es haim tui mane neuki. \v 2 honis he nani haim mitone fun haim sa mitmane, fun eti ai haim hem saksi mam botbeo ge   fun he mitone fun mikrira neuki.
+>>>>>>> cc64aa4934141af84fede8902e8d08e0fb41eb94

01/03.txt

@@ -0,0 +1,2 @@
+\v 3 sa sa he mitmane ji naim mnen maneji, eti ia hem mitonan neu ki, he nati himsa mafut nek bu bua neu kai, fun rais buat noko hai he nan bu bua noko Ama Uis Neno nok Usif Yesus. \v 4 fun are ia ok oke haim tui mane neuki, he nati rais marini ia rair mairini neukit ok oke.
+Tnao Tok Meu Sina

01/05.txt

@@ -0,0 +1 @@
+\v 5 in uabna ese ia he haim nen mane noko hin tuane es eti ia hai miton neuki, Uis Neno he nani Meu sina fun et ama Uis Neno kan mui fa mes nok nes. \v 6 karu hit tauaba tak hit moingki hit he tmafut tok ne mese hit fe het moin et mesnorni, nani hit tapoi fin kan mui fa mnono neo ges .\v 7 mese risu karu hit moin et meu sin'i, huma mese tok ne at moin et meu sina, fun hit moin bu bua tuafes nok tuafes, fun Usif Yesus hin na 'e he nakninu nangkit noko ar hit sanat-sanat.

01/08.txt

@@ -0,0 +1 @@
+\v 8 eti ia hit tauaba tak hit kat mui fa sanat, nane hit tapoi tafani hit tuaki fun mneoti ka titfa et nopaki. \v 9 mese karu hit manauk hit sanat-sanat sin, meu sina he nane nmui et hit tuaki hit sanat-sanat sin Uis Neno nafeti sin naim nak nino kit noko sanat ma penu.\v 10 risu karu hit tauaba tak hit tuaki kat mui sanat fa, nane hit tapoiba tarair je fin kabin uis neno kan mui fa et hit tuaki.

LICENSE.md

@@ -1,5 +1,8 @@
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> cc64aa4934141af84fede8902e8d08e0fb41eb94
 # License
 ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
 
@@ -26,6 +29,7 @@ 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.
+<<<<<<< HEAD
 =======
 ## Creative Commons Attribution-ShareAlike 4.0 International
 
@@ -66,3 +70,5 @@ http://creativecommons.org/licenses/by-sa/4.0/.
 
 This PDF was generated using Prince (https://www.princexml.com/).
 >>>>>>> f47b8d41e17d147e7a95c57c1e3f8895a1a0d8d9
+=======
+>>>>>>> cc64aa4934141af84fede8902e8d08e0fb41eb94

front/title.txt

@@ -1 +1,5 @@
-1 Yohanes
+<<<<<<< HEAD
+1 Yohanes
+=======
+YOHANES
+>>>>>>> cc64aa4934141af84fede8902e8d08e0fb41eb94

manifest.json

@@ -37,10 +37,10 @@
 		"Ardianto Tiran",
 		"LEKSIAS HENUK",
 		"dgjhhkfh",
-		"bahasatech.indotengah"
+		"bahasatech.indotengah",
+		"Riki Ritwan Yonly Rassi"
 	],
 	"finished_chunks": [
-		"front-title",
 		"01-title",
 		"02-title",
 		"02-01",
@@ -82,6 +82,9 @@
 		"05-13",
 		"05-16",
 		"05-18",
-		"05-20"
+		"05-20",
+		"01-08",
+		"01-05",
+		"01-03"
 	]
 }