Thu Feb 22 2024 13:49:48 GMT+0900 (Eastern Indonesia Time)

01/01.txt

@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 \c 1 (Efyei) \v 1 Penatua tobe yepar ar. Tinan it durar natunri iri efa marmau arharen e fya; atek yenri wei, ihap af ahik beh atek yenamwe, we tin am nah iri nane aruane pare tyai. \v 2 Wope wihe fya mau yen idikwe dop ibem iwanen ag-tidik a wau op i, wahen  a fihpi, \v 3 Atehe fya maudi fidik rahmatdop  damai sejahtra mam Allah bedi fam, dop Yesus Kristus tete natun mau, rei iwanen adagmi idik tahaten we e fya dop ateha yen idik.
-(Kefahtan kendiwe Kristus wifanti difam it)
+(Kefahtan kendiwe Kristus wifanti difam it)
+=======
+\c 1 (Efya) \v 1 Yenri penatua eta jematinan mau altop dit dop ibema natun riharit arharen efya. \v 2 Atek ehu iwenafpare marmau dop ihap afa-hik beh, ef it am nairi aru reiral di pare ef-ya, wop wifanti efyamau iwe nidik dopiri rei arkahaken idik afihpi. \v 3 Wihyakaef yamau ha-e dop ih wahen (a)tennuefy(a)i yendi Allah tamanit dop Fransis Mesye natun fu ma-u, i wah(a) tanenwe tarok iwendiwe marmau doph(a)-e.
+(Kohakuen di Fransis Wifanti)
+>>>>>>> 0d9a0c3598d34d141c42b160bdd61d1845d0d81c

01/04.txt

@@ -1 +1,5 @@
-\v 4 Eyau mamro wundu, wop tirik finu aufei efei natumrit rihto arharen e fya altaren diwe tete wifanti egta fidik tarok it. \v 5 Dop tin awuhumu, nen ihapafei wifanti ahtabe awolterfam tarok, wetin ibema eta yendiwe wihi mau egtai ibem yen efihpi pe idik tarok taha tenweief ibem iwaten idik atek it. \v 6 Tinto ibe anduaru ateh yen idik wei, ipur tarok taha tendiwe wifanti ito; tin eyam tarok amkehaken af iwatam atem efyai ef anduaru farheh tririm ambun it.
+<<<<<<< HEAD
+\v 4 Eyau mamro wundu, wop tirik finu aufei efei natumrit rihto arharen e fya altaren diwe tete wifanti egta fidik tarok it. \v 5 Dop tin awuhumu, nen ihapafei wifanti ahtabe awolterfam tarok, wetin ibema eta yendiwe wihi mau egtai ibem yen efihpi pe idik tarok taha tenweief ibem iwaten idik atek it. \v 6 Tinto ibe anduaru ateh yen idik wei, ipur tarok taha tendiwe wifanti ito; tin eyam tarok amkehaken af iwatam atem efyai ef anduaru farheh tririm ambun it.
+=======
+\v 4 Ey(a)u awomnahndi m(a) mamro wopawu womnah manaifa natum it eha y(e)nnei y(e)n pare marmau iwatadi efanduaru tamanit ibunriwe tarok. \v 5 Tin awu himu Nen, ihap afei apur waral terfam printah ahtabe, tap printah mau ibetay(e)n idik mata, amnah taroktaha tenwei tahaten efya. \v 6 Dop h(a)-e, mau pihpitin, amnah tarok taha tendi ibe wifanti perintah mau pihpi, imef wifantiti ibetririm ambun di mata amnah- e am keha kendi ramoroh.
+>>>>>>> 0d9a0c3598d34d141c42b160bdd61d1845d0d81c

01/07.txt

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 \v 7 Wop e iri ranen rahrohtan ewau efouri pe irima aru aldil difandu tin irie ihap dabari kidipe keg ta pur Yesus Kristus ema fandutin tani ebau ne ef manusia tenetin andito iri rahrohtan du it dop anti kristus.
-\v 8 Four we fya fanggomu, hama top e yamto fanggomu iwaf tap ahanduandu idim am fei fam it pe am nah tarok amkerom eyam upah dalduh.
+\v 8 Four we fya fanggomu, hama top e yamto fanggomu iwaf tap ahanduandu idim am fei fam it pe am nah tarok amkerom eyam upah dalduh.
+=======
+\v 7 Wob iri rahroh tanri e wau daldu aharifui iwema fandutin, irit o, ihap keha kendiwe mesye ef, A-re tamtumau iwama, imaf manusia. Irito wallir(a)riau dop arur paldi Yesus ef A-re tamtumau iwama iwamai iwat manusiate netin wob iri andit wallih ra-riau wihi. \v 8 Fam fanggomu amnah eyam nar amke harweldi,ahan dwan ibeh matan taro ta feita-di amnah taromdi andu ibeh matar taharweldi torok tautarom upah mau.
+>>>>>>> 0d9a0c3598d34d141c42b160bdd61d1845d0d81c

01/09.txt

@@ -1 +1,7 @@
-\v 9 Eih rinane ihap kendiwe Kristus wifanti alai pe a e radit ebroh par pare mau u ito Allah ihap ahaf tanendiwe tamarya. We ei ha rei ukoha kuendi wihyalla ma-u, ito etapuldi tamanit, dop natun it. \v 10 We reitih etuwema pe wihi allatin ihap ei fuama; nare mimim ukuet pe iwahenu ramo roh dop dabarim ketot ditap. \v 11 Wop ei ha rei dabum uko ot pe u ko feidi, map ito ima iwarom bagian efei andu hananah mau efei it!
+<<<<<<< HEAD
+\v 9 Eih rinane ihap kendiwe Kristus wifanti alai pe a e radit ebroh par pare mau u ito Allah ihap ahaf tanendiwe tamarya. We ei ha rei ukoha kuendi wihyalla ma-u, ito etapuldi tamanit, dop natun it. \v 10 We reitih etuwema pe wihi allatin ihap ei fuama; nare mimim ukuet pe iwahenu ramo roh dop dabarim ketot ditap. \v 11 Wop ei ha rei dabum uko ot pe u ko feidi, map ito ima iwarom bagian efei andu hananah mau efei it!
+=======
+\v 9 Eiharei ukorof ukobrohpar, dop nar ukuendiwe A-re tamtu wifantit, Allah ihap endiwe fat wafu nah it.
+Efei ei harei iwa nendiwe wifantit, iw(a)tanen diwe tamanit dop natunit. \v 10 Efei eiharei iwatuama, nariwetama wifantitin, narmimimhukuet, kue-kuhirau ra moroh of dabum ukoot kofeidi. \v 11 Wop efei ei hareiy(e) mimim huku(e)dit- uma uku(e)-dian anha-a hananahmau.
+(Taltir)
+>>>>>>> 0d9a0c3598d34d141c42b160bdd61d1845d0d81c

01/12.txt

@@ -1 +1,5 @@
-\v 12 Marmau ouri aupur walterfam tarok eau nare awafei am awal terfam kaltahrau afoh dop tinta wetin eyau harap yabema awatam ama pe awafaltorfam pare tafam rom it, pe idik mamkoi to mahndue fyai. \v 13 EFya mau aweifam mau tarok ito yambema netarim har ahromriri nane ibema ifirit.
+<<<<<<< HEAD
+\v 12 Marmau ouri aupur walterfam tarok eau nare awafei am awal terfam kaltahrau afoh dop tinta wetin eyau harap yabema awatam ama pe awafaltorfam pare tafam rom it, pe idik mamkoi to mahndue fyai. \v 13 EFya mau aweifam mau tarok ito yambema netarim har ahromriri nane ibema ifirit.
+=======
+\v 12 Wihy(a)la ouri wo-far walter fam hepe,-eyau tanik etaru apurwa feifam awal terfan en Kertas / kaltah ra-u dop tinta, wafar apur awatu wawa-u dop wihi awofar a wagta rate tafamrom amnah mamroi iwanenwe. \v 13 Abouri rafum it ibe arfir, arkehfar-am dabari arketot arkefei ama-u.
+>>>>>>> 0d9a0c3598d34d141c42b160bdd61d1845d0d81c

01/title.txt

@@ -1 +1,5 @@
-Pasal 1
+<<<<<<< HEAD
+Pasal 1
+=======
+Pasal 1 (Warfu 1 Hibetih)
+>>>>>>> 0d9a0c3598d34d141c42b160bdd61d1845d0d81c

LICENSE.md

@@ -1,4 +1,5 @@
 
+<<<<<<< HEAD
 # License
 ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
 
@@ -25,3 +26,43 @@ 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.
+=======
+## Creative Commons Attribution-ShareAlike 4.0 International
+
+### Human-Readable Summary 
+  
+
+The Creative Commons Attribution-Share Alike 4.0  International  License is available at
+http://creativecommons.org/licenses/by-sa/4.0/.
+
+#### This is a human-readable summary of (and not a substitute for) the License.
+  
+
+### You are free to:
+
+
+*  **Share** — copy and redistribute the material in any medium or  format.
+
+*  **Adapt** — remix, transform, and build upon the material for any purpose, even commercially.
+
+   The licensor cannot revoke these freedoms  as long as  you follow the license terms.  
+
+### Under the following terms:
+
+*  **Attribution** —You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
+
+*  **ShareAlike** — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.  
+
+*  **No additional restrictions** — You may not apply legal terms or technological measures that legally restrict others from doing anything the license  permits.
+
+
+### Notices:
+
+* 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.
+
+  
+
+This PDF was generated using Prince (https://www.princexml.com/).
+>>>>>>> 0d9a0c3598d34d141c42b160bdd61d1845d0d81c

manifest.json

@@ -39,12 +39,6 @@
 		"Mowakde.Indotimur"
 	],
 	"finished_chunks": [
-		"front-title",
-		"01-title",
-		"01-01",
-		"01-04",
-		"01-07",
-		"01-09",
-		"01-12"
+		"front-title"
 	]
 }