diff --git a/13/01.txt b/13/01.txt index f3dc674..0448369 100644 --- a/13/01.txt +++ b/13/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 E-eh a-up as utubanu o-on Manet Na-ak nuk, to-te as nuk-ak ire utubanu soite vein mon e-evo utu-at Memak-ak na-ar uku ta-an, o-on o-on nuk ovo me-u ainam sin a-ait no-o mon ena ta-au, o-ov ta-avat uku i-io na-ameu. \v 2 O-on sin nau ire, Judas Iskarot ,Simon na-ak nu-uk Manet na-ak a-au u-uan mutu-atan. -======= -\c 13 \v 1 Sak der evo awatim we-en urap Manet an Isetup kakati o par upeka-an. \v 2 Oak esi, ak Juda akak uhau inaman awatupek waitonain. Kukuhu ainam as ire utubanu muite, sin ak akupek naumetonain. Kopor o nu-un oak esi ura a -atonain evo nuk Manet an perou nu uraimu. ->>>>>>> da5685ef61a7b841a36c703fd7d03ea575065315 +\c 13 \v 1 E-eh a-up as utubanu o-on Manet Na-ak nuk, to-te as nuk-ak ire utubanu soite vein mon e-evo utu-at Memak-ak na-ar uku ta-an, o-on o-on nuk ovo me-u ainam sin a-ait no-o mon ena ta-au, o-ov ta-avat uku i-io na-ameu. \v 2 O-on sin nau ire, Judas Iskarot ,Simon na-ak nu-uk Manet na-ak a-au u-uan mutu-atan. \ No newline at end of file diff --git a/13/03.txt b/13/03.txt index 1cf4dba..68370ac 100644 --- a/13/03.txt +++ b/13/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Manet Na-ak nu-uk ire tou vein me-emak naunau ire epuk-an ire mu-u,nuk ire to-te ve-in nuk manet Na-ak vi-iv o-on a-avei Manet na-ar ukuto-on. \v 4 Manet Na-ak e-eh utu ae-ah, avei feriek re-eh apip as kar a-au mu-u a-an ta-aku. \v 5 O-ak nuk re-eh ese-erev, fas a-an no-ou a-a perou sin fa-anaka rei-evatu, o-ok nu-uk, fa-anaka re-eh as ka-ar mu-u a-an ta-aku-u ovo apivatu. -======= -\v 3 Oak esi, ura awtutonain we-en Oak Mem bito-otipi on Sak oha bi to-oru tonain. \v 4 Sak naunau evo nu-un a-awatin. We, we as an sotonain-in. Ak awei-i tahumepek nopaha we der Sak awatun ovo to-otonain-in. Sak naunau irei sou an bi awatun we-en Sak ak nou ta-at. \v 5 Sak Mem na-ar ukanin Nuk sin Wen sureriev wi-i. Oir akak bi orierite, ''Nak atena ukutonan?'' ->>>>>>> da5685ef61a7b841a36c703fd7d03ea575065315 +\v 3 Manet Na-ak nu-uk ire tou vein me-emak naunau ire epuk-an ire mu-u,nuk ire to-te ve-in nuk manet Na-ak vi-iv o-on a-avei Manet na-ar ukuto-on. \v 4 Manet Na-ak e-eh utu ae-ah, avei feriek re-eh apip as kar a-au mu-u a-an ta-aku. \v 5 O-ak nuk re-eh ese-erev, fas a-an no-ou a-a perou sin fa-anaka rei-evatu, o-ok nu-uk, fa-anaka re-eh as ka-ar mu-u a-an ta-aku-u ovo apivatu. \ No newline at end of file diff --git a/13/06.txt b/13/06.txt index 4d8d5f7..02f76fd 100644 --- a/13/06.txt +++ b/13/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 O-ok Saimon pita na-ar so-ou, o-ok Pita nuk ura a-au Meu na-ak fa-ai rei-etonan te-e? \v 7 O-on o-on Manet Na-ak a-avei ura-aim, na-ak ke to-op i-ivei bi esi da toto o-na-an. \v 8 Pita nuk atu-u Na-ak sa-ak fa-ai reiep iv-ei bi, Manet na-ak ave-ei ura-a avi vein sa-ak na-ak fa-an bi rei-ava-an nu-uk na-ak, ape-en ateta-an biti sak-no. \v 9 Simon Pita no-o ura atu-i. Me-eu sa-ak fa-ai bi rei-en, na-ak epi-i no-o iro-omi o-oah rei-en na-ak epi no iro-omi o-oah rei-en. -======= -\v 6 \v 7 \v 8 \v 9 Sak naunau evo nu-un a-awatuno-on o-oraka an ->>>>>>> da5685ef61a7b841a36c703fd7d03ea575065315 +\v 6 O-ok Saimon pita na-ar so-ou, o-ok Pita nuk ura a-au Meu na-ak fa-ai rei-etonan te-e? \v 7 O-on o-on Manet Na-ak a-avei ura-aim, na-ak ke to-op i-ivei bi esi da toto o-na-an. \v 8 Pita nuk atu-u Na-ak sa-ak fa-ai reiep iv-ei bi, Manet na-ak ave-ei ura-a avi vein sa-ak na-ak fa-an bi rei-ava-an nu-uk na-ak, ape-en ateta-an biti sak-no. \v 9 Simon Pita no-o ura atu-i. Me-eu sa-ak fa-ai bi rei-en, na-ak epi-i no-o iro-omi o-oah rei-en na-ak epi no iro-omi o-oah rei-en. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 3b8f683..fdc7fc7 100644 --- a/manifest.json +++ b/manifest.json @@ -199,6 +199,9 @@ "12-27", "12-30", "13-title", + "13-01", + "13-03", + "13-06", "13-10", "13-12", "13-16",