diff --git a/01/01.txt b/01/01.txt index 10c023f..cc2d8c7 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \s YOHANES DA SEMO EUTE WASEYOWE \v 1 Walri yei tena Akalro, Mang Walri kinelre nenei kembalri detelro te krinemelre yansite kyanaye.Walri akyana kna walrore Yohanes te sanenembone, Nei kembalri detelro. \v 2 Yohanes eukiyaye teyowe walri Asna nepelre walri yei,meterena syazasi nei dou ne teyowena. \v 3 Mang Walri mepeto tapenemre detelro da Akundu te benaina, Neperna nemane lati detelro nete betonaina, nepelre semone mropukona mane kembalri nemane mekonaiye, ya nepe nopyepuko. -======= -\c 1 YOHANES DA SEMO EUTE WASEYOWE \v 1 Walri yei tena Akalro ,Mang Walri kinelre nenei kembalri detelro te krinemelre yansite kyanaye.Walri akyana kna walrore Yohanes te sanenembone, Nei kembalri detelro. \v 2 Yohanes eukiyaye teyowe walri Asna nepelre walri yei,meterena syazasi nei dou ne teyowena. \v 3 Mang Walri mepeto tapenemre detelro da Akundu te benaina, Neperna nemane lati detelro nete betonaina,nepelre semone mropukona mane kembalri nemane mekonaiye, ya nepe nopyepuko. ->>>>>>> a46a09650a54b36a4d66a5b2a17cf5bf10907c4d +\c 1 \s YOHANES DA SEMO EUTE WASEYOWE \v 1 Walri yei tena Akalro, Mang Walri kinelre nenei kembalri detelro te krinemelre yansite kyanaye.Walri akyana kna walrore Yohanes te sanenembone, Nei kembalri detelro. \v 2 Yohanes eukiyaye teyowe walri Asna nepelre walri yei,meterena syazasi nei dou ne teyowena. \v 3 Mang Walri mepeto tapenemre detelro da Akundu te benaina, Neperna nemane lati detelro nete betonaina, nepelre semone mropukona mane kembalri nemane mekonaiye, ya nepe nopyepuko. \ No newline at end of file diff --git a/01/04.txt b/01/04.txt index 3eee159..bf6d594 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\s YOHANES ASIA NA WALRI YAU MESI NUNA BE POI A TE TAPEKEMELRE \v 4 Yohanes knalre,mesi suna be walri yau Asia ne, Bise teme poi wetena Nelre na nekewena, yansire nekwena nepelre yansite mendena; neperlati mesi suna be Wau nei engkeng bukou na \v 5 Nepelre, kristus Yesus knalre memte telre tete detelro kna nelrore deyepuko, Delrete ondowafi ondowafi kna bulrane dayobulrane nekende. Nenalre, etena kena bise wari sa dripuko ete peko eilre yemepuko. \v 6 Nepelre, ete ne koprimupuko dia delrembei,Mang Walri nei kembalri detelro, netena Delre, telpelre daselrere dina sreite tnonemende, telpelre. -======= -YOHANES ASIA NA WALRI YAU MESI NUNA BE POI A TE TAPEKEMELRE \v 4 Yohanes knalre,mesi suna be walri yau Asia ne,Bise teme poi wetena Nelre na nekewena, yansire nekwena nepelre yansite mendena; neperlati mesi suna be Wau nei engkeng bukou na \v 5 Nepelre, kristus Yesus knalre memte telre tete detelro kna nelrore deyepuko, Delrete ondowafi ondowafi kna bulrane dayobulrane nekende. Nenalre, etena kena bise wari sa dripuko ete peko eilre yemepuko. \v 6 Nepelre, ete ne koprimupuko dia delrembei,Mang Walri nei kembalri detelro, netena Delre, telpelre daselrere dina sreite tnonemende, telpelre. ->>>>>>> a46a09650a54b36a4d66a5b2a17cf5bf10907c4d +\s YOHANES ASIA NA WALRI YAU MESI NUNA BE POI A TE TAPEKEMELRE \v 4 Yohanes knalre,mesi suna be walri yau Asia ne, Bise teme poi wetena Nelre na nekewena, yansire nekwena nepelre yansite mendena; neperlati mesi suna be Wau nei engkeng bukou na \v 5 Nepelre, kristus Yesus knalre memte telre tete detelro kna nelrore deyepuko, Delrete ondowafi ondowafi kna bulrane dayobulrane nekende. Nenalre, etena kena bise wari sa dripuko ete peko eilre yemepuko. \v 6 Nepelre, ete ne koprimupuko dia delrembei,Mang Walri nei kembalri detelro, netena Delre, telpelre daselrere dina sreite tnonemende, telpelre. \ No newline at end of file diff --git a/01/07.txt b/01/07.txt index dda86ad..7b78301 100644 --- a/01/07.txt +++ b/01/07.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 7 Tembe walri yei ma drusuku mewe,metelrena dou. Nete tenembe, nemane lati nembere nekaina, da yoo bulrana selrai bra bra nete dimite diminaiye, ya, dana yumbona. Telpelre \v 8 De tuna seina, Mang Walri asna, Nekwena, yansire nekwena, Nepelre yansite mendena, Nei delre eine,’’ -======= -\v 7 Tembe walri yei ma drusuku mewe,metelrena dou -Nete tenembe, nemane lati nembere nekaina, da yoo bulrana selrai bra bra nete dimite diminaiye, ya, dana yumbona. Telpelre \v 8 De tuna seina,Mang Walri asna, Nekwena, yansire nekwena, Nepelre yansite mendena, Nei delre eine,’’ ->>>>>>> a46a09650a54b36a4d66a5b2a17cf5bf10907c4d +\v 7 Tembe walri yei ma drusuku mewe,metelrena dou. Nete tenembe, nemane lati nembere nekaina, da yoo bulrana selrai bra bra nete dimite diminaiye, ya, dana yumbona. Telpelre \v 8 De tuna seina, Mang Walri asna, Nekwena, yansire nekwena, Nepelre yansite mendena, Nei delre eine,’’ \ No newline at end of file diff --git a/01/09.txt b/01/09.txt index becb3ad..71f65b4 100644 --- a/01/09.txt +++ b/01/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\s WALRI YEI TE YOHANES EUKIYAYE TEPUKO \v 9 De, Yohanes, dokeka, Nepelre walri yona nekememupukona kalro te dikitemelre, nepelre walri yei kna eine knatepa tepa, Patmos eidona kepou ne nekalre, Walri Asna nepelre walri yei tante, \v 10 De Wau pretutku,walri nei yane, De betoyalre metosulre a daneyowe toni kulrung mane. \v 11 Saneyotu, metelre da teyena semokepei eite mropone. Neplre mekoupone mesi suna be Walri yau kote, Efesus, Smirna -======= -WALRI YEI TE YOHANES EUKIYAYE TEPUKO \v 9 De, Yohanes, dokeka ,Nepelre walri yona nekememupukona kalro te dikitemelre, nepelre walri yei kna eine knatepa tepa, Patmos eidona kepou ne nekalre, Walri Asna nepelre walri yei tante, \v 10 De Wau pretutku,walri nei yane, De betoyalre metosulre a daneyowe toni kulrung mane. \v 11 Saneyotu, metelre da teyena semokepei eite mropone. Neplre mekoupone mesi suna be Walri yau kote, Efesus,Smirna ->>>>>>> a46a09650a54b36a4d66a5b2a17cf5bf10907c4d +\s WALRI YEI TE YOHANES EUKIYAYE TEPUKO \v 9 De, Yohanes, dokeka, Nepelre walri yona nekememupukona kalro te dikitemelre, nepelre walri yei kna eine knatepa tepa, Patmos eidona kepou ne nekalre, Walri Asna nepelre walri yei tante, \v 10 De Wau pretutku,walri nei yane, De betoyalre metosulre a daneyowe toni kulrung mane. \v 11 Saneyotu, metelre da teyena semokepei eite mropone. Neplre mekoupone mesi suna be Walri yau kote, Efesus, Smirna \ No newline at end of file diff --git a/01/12.txt b/01/12.txt index 7574031..e0839c4 100644 --- a/01/12.txt +++ b/01/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Pergamus, Tiatira, Sardis, Fila delfia nepelre Laodikia.’’ \v 12 Neperna, De seso te sasengkukalre tetembo akulrung sime dete sanutu, ne sasungkakalre, de kaki dian emas te tembukalre, \v 13 Ne kaki dian nelrone de tialre, detelro mane nekyowe, Mayong tikite titipuko oto selreite, nepelre spainangkre kenane olrungkuko. -======= -Pergamus, Tiatira, Sardis,Fila delfia nepelre Laodikia.’’ \v 12 Neperna, De seso te sasengkukalre tetembo akulrung sime dete sanutu, ne sasungkakalre,de kaki dian emas te tembukalre, \v 13 Ne kaki dian nelrone de tialre , detelro mane nekyowe, Mayong tikite titipuko oto selreite,nepelre spainangkre kenane olrungkuko. ->>>>>>> a46a09650a54b36a4d66a5b2a17cf5bf10907c4d +Pergamus, Tiatira, Sardis, Fila delfia nepelre Laodikia.’’ \v 12 Neperna, De seso te sasengkukalre tetembo akulrung sime dete sanutu, ne sasungkakalre, de kaki dian emas te tembukalre, \v 13 Ne kaki dian nelrone de tialre, detelro mane nekyowe, Mayong tikite titipuko oto selreite, nepelre spainangkre kenane olrungkuko. \ No newline at end of file diff --git a/manifest.json b/manifest.json index ae27a05..7d54c06 100644 --- a/manifest.json +++ b/manifest.json @@ -39,6 +39,11 @@ "finished_chunks": [ "front-title", "01-title", + "01-01", + "01-04", + "01-07", + "01-09", + "01-12", "01-14", "01-17", "01-19",