diff --git a/01/04.txt b/01/04.txt index 56e4111..dd9385e 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Nuk nou eherak ta-ak, o-ok eherak owo nuk ati sasep sin unum aka-ak. \v 5 Sasep owo kakatu o-ak sasev, on kakatu bi dokumeu. -======= -\v 4 Ovo nu-un Nikodimas Manet Na-ak orietuv "Atera sin awei ur mai soto-on ,we-en nuk ere meu meite?"Atet nuk awei anak o-owan noha awei ur mai-i ame soto te?" \v 5 Manet Na-ak Nikodimas ura a-atuv," Kukuhu ainam , sin de an nou O-ok Omi an ur mai-i bi soto ovo nuk , nuk Manet nukak dokumep apan bi wato-on. ->>>>>>> 65b6ddaafe7a25292e5bce94d92f7815ade91940 +\v 4 Nuk nou eherak ta-ak, o-ok eherak owo nuk ati sasep sin unum aka-ak. \v 5 Sasep owo kakatu o-ak sasev, on kakatu bi dokumeu. \ No newline at end of file diff --git a/01/06.txt b/01/06.txt index 7205f7b..9e889d6 100644 --- a/01/06.txt +++ b/01/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Manet sin oir sur-retuv wi-iv, wen wanih nuk Jon. \v 7 Sasep an atan nuk sur-retev wi-iv, ura-on sinait unum orak-an nuk tatan. \v 8 Jon nuk sasep bi, wei-in sasep evon atan wi-iv. -======= -\v 6 We-e we-e ferumi mon evo uraite ovo nuk ferumi mon evo nukak we-e we-e O-0k Omi uraite ovo nuk O-ok Omi nukak. \v 7 Der sak a-asim ovo nu-un nak to-on bi u-uwar. A-akawei urmai sotonain. \v 8 Oro nuk atera san kura ukute onuk ura san kura ukuto-on. Nak oro esi op totonan.Nak oro atena mai-i wi-i te ovo nak bi to-om, Nak oro atena uku to-on oha nak bi to-om. Evo nuk wen sin O-ok Omian ur maii soite iwei. ->>>>>>> 65b6ddaafe7a25292e5bce94d92f7815ade91940 +\v 6 Manet sin oir sur-retuv wi-iv, wen wanih nuk Jon. \v 7 Sasep an atan nuk sur-retev wi-iv, ura-on sinait unum orak-an nuk tatan. \v 8 Jon nuk sasep bi, wei-in sasep evon atan wi-iv. \ No newline at end of file diff --git a/01/09.txt b/01/09.txt index a19b291..d0d1ffe 100644 --- a/01/09.txt +++ b/01/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Ewo sasep kukuhu, sin unum devatutan, mon unum an sou-uv. -======= -\v 9 Nikodimas Manet Na-ak orietuv, "Naunau evo atera sota-an?" ->>>>>>> 65b6ddaafe7a25292e5bce94d92f7815ade91940 +\v 9 Ewo sasep kukuhu, sin unum devatutan, mon unum an sou-uv. \ No newline at end of file diff --git a/01/16.txt b/01/16.txt index 992081b..58ebdba 100644 --- a/01/16.txt +++ b/01/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 Ov epor nuk ouvan ami beite, ov nu nukak, nuk sansan ik-unum esureku usaetite. \v 17 Moses maror ati reku, ovo nu no der kukuhu Manet nar aimu. \v 18 Sin oir Manet as oir amuk an binreite, nuk ati Manet, ven nuk Manet utubanu tate, ovo nuk urau Manet arik soite. -======= -\v 16 Manet nuk sin ait unum mon evona maiyan amukpep me-eu ainam atuha ''Na-ak'' oisik atin ovo devatuv, onu-un sin wen ''Nukakun isetuto ovo nuk bi nau-u meto-on, nuk esi ehera-akmep as as nu tato-on. \v 17 Manet ''Na-ak'' mon evona suretiev wi-iv ovo, ''Nuk'' sin ait der fah muatuto-on bi wi-iv, ''Nuk'' awatuto-on wi-iv. \v 18 Sin wen Manet Na-ak isetuto ovo nuk bi nau meto-on, sin wen nuk bi istuto ovo nuk nau meto-on, we-en nuk Manet Na-ak wanihan bi isetite. ->>>>>>> 65b6ddaafe7a25292e5bce94d92f7815ade91940 +\v 16 Ov epor nuk ouvan ami beite, ov nu nukak, nuk sansan ik-unum esureku usaetite. \v 17 Moses maror ati reku, ovo nu no der kukuhu Manet nar aimu. \v 18 Sin oir Manet as oir amuk an binreite, nuk ati Manet, ven nuk Manet utubanu tate, ovo nuk urau Manet arik soite. \ No newline at end of file diff --git a/01/19.txt b/01/19.txt index 0a7efcb..0cfc309 100644 --- a/01/19.txt +++ b/01/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 O-on der evo Jon nukak, Pris nou Livai su-uretuk Jerusalem utuna-at vin orietuk. Nak ven ainam? \v 20 Nuk der bi-rokumev, der arike av,avei orietuk, sak Manet Na-ak bi. \v 21 On-on ak orietuk, nak ven anim? Nak Elaisa? o-ok nuk ura-av, sak nuk bi, avei orietuk, atet nak Profet te? barisetu bi av. -======= -\v 19 We-en der fan mu-up nukak nah nuk era,''Sasep'' ire mon evona wi-iv, Weiin sin ak kakatu-un meuv ainam amunaka bev dana-at sasepan amunaka bi bev, we-en kopor akak ovo nubi. \v 20 Sin unum kopor nubi uraipi nou ak sasespan sopan ui- ipi, we-en kopor nubi akak ovo arik soma-an. \v 21 Sin wen ak kopor nu sansan uraipi ak esi sasepan sotonain, weiin oir oir o-ak arowatunaha a-atonaiin eak Manet nukak kopor ainam totoetipi. ->>>>>>> 65b6ddaafe7a25292e5bce94d92f7815ade91940 +\v 19 O-on der evo Jon nukak, Pris nou Livai su-uretuk Jerusalem utuna-at vin orietuk. Nak ven ainam? \v 20 Nuk der bi-rokumev, der arike av,avei orietuk, sak Manet Na-ak bi. \v 21 On-on ak orietuk, nak ven anim? Nak Elaisa? o-ok nuk ura-av, sak nuk bi, avei orietuk, atet nak Profet te? barisetu bi av. \ No newline at end of file diff --git a/01/22.txt b/01/22.txt index 353d136..872d653 100644 --- a/01/22.txt +++ b/01/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 On-on atuk, a-an usaetun, nak ven, nak tutu akun avei ukun sin akak vimu-o tutu evatuton? nak naikin ve-e aton? \v 23 Nuk av, sak rerev oir sak sin bi tapian vev, Meu nukak im tutumetupek koror sovar o-on Profet Asaia a-av. -======= -\v 22 Da-a sum naunau ura sokaha Manet Na-ak nou perou sin nukakat Judia ukuk. ''Nuk hoha-ak oak nou ta-at sin ait dera-awatuv. \v 23 Jon hoha sin dera-a watuv ap Ainon a-apian ap Salim utubanu we-en wana nuk de kene-ebi o-on sin ait nuk na-ar wiiekat dera-awatuv. ->>>>>>> 65b6ddaafe7a25292e5bce94d92f7815ade91940 +\v 22 On-on atuk, a-an usaetun, nak ven, nak tutu akun avei ukun sin akak vimu-o tutu evatuton? nak naikin ve-e aton? \v 23 Nuk av, sak rerev oir sak sin bi tapian vev, Meu nukak im tutumetupek koror sovar o-on Profet Asaia a-av. \ No newline at end of file diff --git a/01/24.txt b/01/24.txt index 2d88b5b..8a05b24 100644 --- a/01/24.txt +++ b/01/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 O-on farasi sin oiroir surevatiek vana ukuk, o-oak orietuna ura-atuk. \v 25 Vei-in sin reravatim,ve-ein nak Manet Na-ak bi o Elaisa bi o Profet o-oha bi? -======= -\v 24 As ovona nuk Jon kalabusan bi ukup. \v 25 Ovona Jon nukak perou sin nou sin oir Juda maii atera dera-at amukep nu sopan der an beteteii. ->>>>>>> 65b6ddaafe7a25292e5bce94d92f7815ade91940 +\v 24 O-on farasi sin oiroir surevatiek vana ukuk, o-oak orietuna ura-atuk. \v 25 Vei-in sin reravatim,ve-ein nak Manet Na-ak bi o Elaisa bi o Profet o-oha bi? \ No newline at end of file diff --git a/manifest.json b/manifest.json index e6993a3..32b9d90 100644 --- a/manifest.json +++ b/manifest.json @@ -46,6 +46,12 @@ "front-title", "01-title", "01-01", + "01-04", + "01-06", + "01-09", + "01-16", + "01-19", + "01-22", "02-03", "02-06", "02-09",