diff --git a/10/26.txt b/10/26.txt index 0d3be4a..58d0c33 100644 --- a/10/26.txt +++ b/10/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -(Mang Walri tena adetena dipainya) \v 26 Nemane, e metelrena nepe poite nemeyanenbuko nekoutena peko tena mekopainya, nepelrena kembeu mena ambai pekote baite suku nemelrena. \v 27 Nepelrena e temalrena endikite dekomalrenape a te tiyen dena plre sing Mang Walri kenalre nena ate pekote mekonemlre. -======= -\v 26 Nemane, e metelrena nepe poite nemeyanenbuko nekoutena peko tena mekopainya, nepelrena kembeu mena ambai pekote baite suku nemelrena. \v 27 Nepelrena e temalrena endikite dekomalrenape a te tiyen dena plre sing Mang Walri kenalre nena ate pekote mekonemlre. ->>>>>>> 8ad77a117b69d32634d35be5bc23842fc655576b +\v 26 Nemane, e metelrena nepe poite nemeyanenbuko nekoutena peko tena mekopainya, nepelrena kembeu mena ambai pekote baite suku nemelrena. \v 27 Nepelrena e temalrena endikite dekomalrenape a te tiyen dena plre sing Mang Walri kenalre nena ate pekote mekonemlre. \ No newline at end of file diff --git a/10/30.txt b/10/30.txt index 6284d31..2172554 100644 --- a/10/30.txt +++ b/10/30.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD \v 30 Nemane, e nmeyambuko Ne ate elriyowe, “Pewalrin pe nena de mekotepona; depe walrin te neme singklritepona.” Ne elriyowe, “Mang Walri nenei tou selrai te ate tendena.” \v 31 Eu kanglre mane Mang Walri kena mebulrate toplri mapone. -======= -\v 30 Nemane, e nmeyambuko Ne ate elriyowe, “Pewalrin pe nena de mekotepona; depe walrin te neme singklritepona.” Ne elriyowe, “Mang Walri nenei tou selrai te ate tendena.” \v 31 Eu kanglre mane Mang Walri kena mebulrate toplri mapone. -( Alrma Plre Kena tepa-tepa Semate nekembe ) ->>>>>>> 8ad77a117b69d32634d35be5bc23842fc655576b +( Alrma Plre Kena tepa-tepa Semate nekembe ) \ No newline at end of file diff --git a/10/32.txt b/10/32.txt index 60fdeef..40f5402 100644 --- a/10/32.txt +++ b/10/32.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -(Alrma Plre Kena tepa-tepa Semate nekembe) \v 32 Nemane, mendote mekombe ya'ya mote teyayena, we metelrena temete doukawe, wenoune singklrimbombe sedopelre nate kembombe. \v 33 Ya mbei-mbei, wete a peko sanenaimlre nepelre me slro-slro mekonaimelre kiya nelrone detelro dopelrena bulrane, nepelre ya mbei-mbei we delrwti tuwanembe detelro wete mekai mepukona mane. \v 34 Wedaiti bise te delre nembe detelro ongko ne tenayenate, nemane we kalrite kombe wena miye dekona sasasi baite olrunayena nete nate we nimeyanembombe we sasasi poi tlrena te yatembe Walri nemane mote nekembe mende. -======= -\v 32 Nemane, mendote mekombe ya'ya mote teyayena, we metelrena temete doukawe, wenoune singklrimbombe sedopelre nate kembombe. \v 33 Ya mbei-mbei, wete a peko sanenaimlre nepelre me slro-slro mekonaimelre kiya nelrone detelro dopelrena bulrane, nepelre ya mbei-mbei we delrwti tuwanembe detelro wete mekai mepukona mane. \v 34 Wedaiti bise te delre nembe detelro ongko ne tenayenate, nemane we kalrite kombe wena miye dekona sasasi baite olrunayena nete nate we nimeyanembombe we sasasi poi tlrena te yatembe Walri nemane mote nekembe mende. ->>>>>>> 8ad77a117b69d32634d35be5bc23842fc655576b +\v 32 Nemane, mendote mekombe ya'ya mote teyayena, we metelrena temete doukawe, wenoune singklrimbombe sedopelre nate kembombe. \v 33 Ya mbei-mbei, wete a peko sanenaimlre nepelre me slro-slro mekonaimelre kiya nelrone detelro dopelrena bulrane, nepelre ya mbei-mbei we delrwti tuwanembe detelro wete mekai mepukona mane. \v 34 Wedaiti bise te delre nembe detelro ongko ne tenayenate, nemane we kalrite kombe wena miye dekona sasasi baite olrunayena nete nate we nimeyanembombe we sasasi poi tlrena te yatembe Walri nemane mote nekembe mende. \ No newline at end of file diff --git a/12/01.txt b/12/01.txt index b5ea270..6907dd9 100644 --- a/12/01.txt +++ b/12/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 12 (Yesus Tena Mane) \v 1 Neman dlrati ete taimena doplre ma mane antunaimepuko eune silraipekonate metlreye ane klromaponde nakaye kenalre ketemaponde oto mbeite malre e'tena menaya dlrati dunumbukona kote. \v 2 Ena dou Yesus ko mote klromambonde, Walri tou nepelre ena telrplre pote sipi muna, netena kalri pote nepe dina dunaimbuko, kenalre ketepuko osete elrutuku nepelre pekote baite sumupuko. Nakaye daya slreina, Mang Walria keplre engkeng metlre mesune ke nekewe, \v 3 Yesus kena oyote meyembe, kenalre ketepuko peko detelro kena yembe tante wei eunulrute telro melromupuko. -======= -\c 12 ( Yesus Tena Mane ) \v 1 Neman dlrati ete taimena doplre ma mane antunaimepuko eune silraipekonate metlreye ane klromaponde nakaye kenalre ketemaponde oto mbeite malre e'tena menaya dlrati dunumbukona kote. \v 2 Ena dou Yesus ko mote klromambonde, Walri tou nepelre ena telrplre pote sipi muna, netena kalri pote nepe dina dunaimbuko, kenalre ketepuko osete elrutuku nepelre pekote baite sumupuko. Nakaye daya slreina, Mang Walria keplre engkeng metlre mesune ke nekewe, \v 3 Yesus kena oyote meyembe, kenalre ketepuko peko detelro kena yembe tante wei eunulrute telro melromupuko. ->>>>>>> 8ad77a117b69d32634d35be5bc23842fc655576b +\c 12 (Yesus Tena Mane) \v 1 Neman dlrati ete taimena doplre ma mane antunaimepuko eune silraipekonate metlreye ane klromaponde nakaye kenalre ketemaponde oto mbeite malre e'tena menaya dlrati dunumbukona kote. \v 2 Ena dou Yesus ko mote klromambonde, Walri tou nepelre ena telrplre pote sipi muna, netena kalri pote nepe dina dunaimbuko, kenalre ketepuko osete elrutuku nepelre pekote baite sumupuko. Nakaye daya slreina, Mang Walria keplre engkeng metlre mesune ke nekewe, \v 3 Yesus kena oyote meyembe, kenalre ketepuko peko detelro kena yembe tante wei eunulrute telro melromupuko. \ No newline at end of file diff --git a/12/04.txt b/12/04.txt index 66178a4..814f8ec 100644 --- a/12/04.txt +++ b/12/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -(Mang Walri Mai Tenamane) \v 4 Weye pekote wei sate dilriponalre baite nunsunde na tena elrikopai. \v 5 Neplre, yei kalro menatena Asna saniyaimena tena kepawe duwau puko? “Delrei yei, Tuhan kena a kalro kilriyoumena tena we amise mise tena milroipainya, nepelre wete aye sanenwelre nena we kena yoktipainya. \v 6 Nena Tuhan kena bise dununa detelro te klrimu, neplre nenei yei mane yatekemelrena te cambuk sasumu.” -======= -( Mang Walri Mai Tenamane ) \v 4 Weye pekote wei sate dilriponalre baite nunsunde na tena elrikopai. \v 5 Neplre, yei kalro menatena Asna saniyaimena tena kepawe duwau puko? “Delrei yei, Tuhan kena a kalro kilriyoumena tena we amise mise tena milroipainya, nepelre wete aye sanenwelre nena we kena yoktipainya. \v 6 Nena Tuhan kena bise dununa detelro te klrimu, neplre nenei yei mane yatekemelrena te cambuk sasumu.” ->>>>>>> 8ad77a117b69d32634d35be5bc23842fc655576b +(Mang Walri Mai Tenamane) \v 4 Weye pekote wei sate dilriponalre baite nunsunde na tena elrikopai. \v 5 Neplre, yei kalro menatena Asna saniyaimena tena kepawe duwau puko? “Delrei yei, Tuhan kena a kalro kilriyoumena tena we amise mise tena milroipainya, nepelre wete aye sanenwelre nena we kena yoktipainya. \v 6 Nena Tuhan kena bise dununa detelro te klrimu, neplre nenei yei mane yatekemelrena te cambuk sasumu.” \ No newline at end of file diff --git a/manifest.json b/manifest.json index c236471..47f78c6 100644 --- a/manifest.json +++ b/manifest.json @@ -88,10 +88,16 @@ "10-15", "10-17", "10-19", + "10-23", + "10-26", "10-28", + "10-30", + "10-32", "10-35", "10-38", "12-title", + "12-01", + "12-04", "12-07", "12-12", "12-14",