Fri Oct 23 2020 16:50:03 GMT+0700 (SE Asia Standard Time)

01/03.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 3 Zauwa ku bersyukur padu barrai Mori, napa layanigu waina ate nurani a zingira zama neghe parawida ama kaweda waikagu, saat zauwa baku lologu ne tabaya-tabaya lodo monno gede. \v 4 Ne zauwa baku lolo we'e matamu, zauwa beina etagu ga'ika bonnu ne magheghera ate. \v 5 Zauwa apalologa neghe ate waimu a tulus, ne a ullu-ullu moripa barra inna kawedamu Lois, monno mamamu Eunike, monno Zauwa yakin ne maghinna moripa barra yemmi kaina.
-=======
-\v 3 Zauwa senantiasa bersyukura barrana Mori, nepalayanigu waige ate nurani a zingira ghinnana ne parawida ghidda inni kaweda waikagu, saat zauwa bakulolomi ne tabaya-tabaya sanagu loddo monno gedde. \v 4 Netti baku lologudi wee matamu, zauwa kubeige etaghu gai kanabonnuge sukacitagu. \v 5 Zauwa palologawe waige atewaimu a tulusa, ne ullu-ullu moripa barra innikawedamu Lois, monno innnamu Eunike, monno zauwa yakinge nemeghinna moripa barrami yemmi kaina.
->>>>>>> c32e9561bb653327b0b078e8b6b56da9bcb10e96
+\v 3 Zauwa ku bersyukur padu barrai Mori, napa layanigu waina ate nurani a zingira zama neghe parawida ama kaweda waikagu, saat zauwa baku lologu ne tabaya-tabaya lodo monno gede. \v 4 Ne zauwa baku lolo we'e matamu, zauwa beina etagu ga'ika bonnu ne magheghera ate. \v 5 Zauwa apalologa neghe ate waimu a tulus, ne a ullu-ullu moripa barra inna kawedamu Lois, monno mamamu Eunike, monno Zauwa yakin ne maghinna moripa barra yemmi kaina.

01/06.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 6 Tagu alasan niawene, zauwa lolomi ka engage bi kobarkange kanurru Mori a gha'ina barra toumu lewata badala limmagu. \v 7 Niawe, Mori danna yakida barra ghitto roh madauta, melainkan roh paghezi, manawara, monno pattu wekina.
-=======
-\v 6 Taguna alasan neghe niadowe, zauwa kupalolomiwe gai kapakitage mengobarkan karuniai Mori a ghaina barra toumu melalui pamaghozi limmagu. \v 7 Sebab, Mori dana yakiwe barrada ghitto roh madauta, melainkan roh paghezzi, manawwara, monno kuasage tou.
->>>>>>> c32e9561bb653327b0b078e8b6b56da9bcb10e96
+\v 6 Tagu alasan niawene, zauwa lolomi ka engage bi kobarkange kanurru Mori a gha'ina barra toumu lewata badala limmagu. \v 7 Niawe, Mori danna yakida barra ghitto roh madauta, melainkan roh paghezi, manawara, monno pattu wekina.

01/08.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 8 Jadi, ammana pameke bersaksi tuba Marambada ghitto atau tuba zauwa, papattu-Na. Takka nia, oleh kuasana Mori dekuna karoduka tagu Injil.\v 9 Nia a tuluda ghitto monno akadangada ghitto ne kadanga zingira, daniakipo orona parawida ghitto, melainkan orona tujuan monno kanurru-Nia douna ne Nia payana barrada ghitto barra Yesu Karittu sebelum ponnu tana Gha'ige. \v 10 Ne maghinna, hal neghe na nyata lewata maina Jury selamatda ghitto Yesu Karittu a opiwe mate monno ghidiwe Moripa monno kekekalan lewata Injil. \v 11 Ole Injil neiwe, zauwa adodokaga  jadi pengkhotbah, rasul, monno guru.
-=======
-\v 8 Niaka, ammana napamakke taguna Mori daghitto atau tagu zauwa, tahanan-Na. Ba ka, oleh kuasai Mori dekuge menderita demi Injila. \v 9 Niadona pasalamata bada ghitto monno kadangngada ghitto waige pakadangnga kudusa, inda oroniakiwe patada ghitto, melainkan orona paarona monno kanurrukanangga dou-Na ne paya bana barrada ghitto barrai Yesu Krittu neba daipoge ponnutanah. \v 10 Nemeghinna, hal neghe na nyata bawe melalui bana mai Juru Selamatda ghitto Yesu Krittu a opi bawe kamate monno ngindi moripa monno kekekalanna melalui Injila. \v 11 Oleh Injila niabawe, zauwa dodokaga bakujadi pengkhotbah, rasulla, monno guru.
->>>>>>> c32e9561bb653327b0b078e8b6b56da9bcb10e96
+\v 8 Jadi, ammana pameke bersaksi tuba Marambada ghitto atau tuba zauwa, papattu-Na. Takka nia, oleh kuasana Mori dekuna karoduka tagu Injil. \v 9 Nia a tuluda ghitto monno akadangada ghitto ne kadanga zingira, daniakipo orona parawida ghitto, melainkan orona tujuan monno kanurru-Nia douna ne Nia payana barrada ghitto barra Yesu Karittu sebelum ponnu tana Gha'ige. \v 10 Ne maghinna, hal neghe na nyata lewata maina Jury selamatda ghitto Yesu Karittu a opiwe mate monno ghidiwe Moripa monno kekekalan lewata Injil. \v 11 Ole Injil neiwe, zauwa adodokaga  jadi pengkhotbah, rasul, monno guru.

01/12.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 12 Niadowe nia ne, zauwa karoduka nezama ne maghinna neghe, niaka, zauwa dappa mekkeki barra garrai zauwa waige monno zauwa yakin ba Nia sanggup Daga appa ne Nia papercayanaga Barragu dukki nelodo Netti bana madukkiwe. \v 13 Terrege pokok-pokok ajaran sehat ne yemmi parenge wali barragu ne ate wai monno manawara a gha'ina barra Yesu Karittu. \v 14 Monno Roh Zingira a dangi ne barrada ghitto, data paduwaza ne adua dana pote a pawelliza na papapercayada barramu.
-=======
-\v 12 Niabawe sebabnawe, zauwa kumenderitaga ghinnana nemeghinna neghe. Takka, zauwa daku paddekina makke orona zauwa paddege barra garrana zauwa baku waige monno zauwa yakinge bahwa Nia sanggup daga appawe ne Nia pawai bana barragu dukkiwe rapana ne bana riaka. \v 13 Terredi pukke-pukke papanungnga sehat neparengnge bami barragu barra atewai monno manawwara a ghaina barrana Yesu Krittu. \v 14 Waige Roh Kudusa dangngi ne barrada ghitto, daga duawe harta  pawelli ne papercaya bada barramu.
->>>>>>> c32e9561bb653327b0b078e8b6b56da9bcb10e96
+\v 12 Niadowe nia ne, zauwa karoduka nezama ne maghinna neghe, niaka, zauwa dappa mekkeki barra garrai zauwa waige monno zauwa yakin ba Nia sanggup Daga appa ne Nia papercayanaga Barragu dukki nelodo Netti bana madukkiwe. \v 13 Terrege pokok-pokok ajaran sehat ne yemmi parenge wali barragu ne ate wai monno manawara a gha'ina barra Yesu Karittu. \v 14 Monno Roh Zingira a dangi ne barrada ghitto, data paduwaza ne adua dana pote a pawelliza na papapercayada barramu.

01/15.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 15 Yemmi padde wali fakta ba ngarakuwa a gha'ina ne Asia na  poter wali barragu, ne tilluda ghidda Niadu Figelus monno Hermogenes. \v 16 Kirana Maramba nakanurruge manawara dana barra i'na umma Onesiforus orona nia sering pasegarga monno danna mekkeki orona gollu danaga. \v 17 Kaballekana, neba dukki Roma, nia na semangat bana ghegaga monno padukki danga-ga \v 18 Kirana Maramba natuntuni agar nia kakolege manawara wali Maramba ne lodo netti, ne peigha'i kaina yemmi douna paddege pirra luwana pelayanan  ne nia payana barragu ne Efesus.
-=======
-\v 15 Yemmi paddege fakta bahwa ngarakua a ghaina ne Asia talira bana waligu, ne barrada ghidda ghaini Figelus monno Hermogenesa. \v 16 Kiranawe Mori natawe manarra rana barra ngara i umma Onesiforusa orona nia naduttuna bana pasegaraga monno dana makkeki orona baneega golludana. \v 17 Ghinnaghaidowe, netti ba dukki ne Roma, nia waige semangata bana ghewaga mono natangaga. \v 18 Kiranawe Mori nadekuni gai nia kanatobbokawe manarrana walina Mori ne loddo ne, peighaina yemmi douna paddege pirra mangedada pelayanan ne paya bana nia barragu ne Efesusa.
->>>>>>> c32e9561bb653327b0b078e8b6b56da9bcb10e96
+\v 15 Yemmi padde wali fakta ba ngarakuwa a gha'ina ne Asia na  poter wali barragu, ne tilluda ghidda Niadu Figelus monno Hermogenes. \v 16 Kirana Maramba nakanurruge manawara dana barra i'na umma Onesiforus orona nia sering pasegarga monno danna mekkeki orona gollu danaga. \v 17 Kaballekana, neba dukki Roma, nia na semangat bana ghegaga monno padukki danga-ga \v 18 Kirana Maramba natuntuni agar nia kakolege manawara wali Maramba ne lodo netti, ne peigha'i kaina yemmi douna paddege pirra luwana pelayanan  ne nia payana barragu ne Efesus.

02/01.txt

@@ -1,6 +1 @@
-<<<<<<< HEAD
-Ka'engage Setia meskipun Karoduka
-\v 1 Orona netti, anagu, jadilah paghezi barra kanurru ne gha'i barra Yesu Karittu. \v 2 Appawe ne yemmi parenge wali zauwa he aro luwana saksi, percayakan netti barra ata-ata a setia, ghidda kaina mampu mengajar ata wedeka.
-=======
-\c 2 Engage Padeku Lakkaupu Menderita \v 1 Orona ne, anagu, gai kipaghezzimi waige kanurrukanangga a ghaina barrai Yesu Krittu. \v 2 Appa pongngukowe ne yemmi parengnge bami walina zauwa ne aro mangeda saksi, percayakange barra ata-ata padeku, a paghezzi kaina panungngana ata wadde.
->>>>>>> c32e9561bb653327b0b078e8b6b56da9bcb10e96
+\c 2 Ka'engage Setia meskipun Karoduka \v 1 Orona netti, anagu, jadilah paghezi barra kanurru ne gha'i barra Yesu Karittu. \v 2 Appawe ne yemmi parenge wali zauwa he aro luwana saksi, percayakan netti barra ata-ata a setia, ghidda kaina mampu mengajar ata wedeka.

manifest.json

@@ -41,6 +41,11 @@
 		"front-title",
 		"01-title",
 		"01-01",
+		"01-03",
+		"01-06",
+		"01-08",
+		"01-12",
+		"01-15",
 		"02-title",
 		"03-title",
 		"04-title"