From de3e183b049ebb86ba8c65dfecd13a3b93a358c4 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Fri, 3 May 2019 22:33:46 +1000 Subject: [PATCH] Fri May 03 2019 22:33:45 GMT+1000 (West Pacific Standard Time) --- 01/26.txt | 6 +----- 01/29.txt | 6 +----- manifest.json | 3 +++ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/01/26.txt b/01/26.txt index 272f5d9..c9f3376 100644 --- a/01/26.txt +++ b/01/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Jon der akak noh betuk at a-av, "sak re an ati re revatim. O-on sin oir gamuk a-ak nou tate, o-ak nuk bi areipi. \v 27 Sin oir esi sumi an vitan, sak nuhainam bi muri fak an epikeretupan." \v 28 Naunau unum evo sov beteni Jodan re rato san, Jon re eherak mep devatu. -======= -\v 26 Sin Jon na-ar ukunaha a-atuk, Tisa ''Sin''wen Jodan de da-ato nak nou ta-iiyat nak ''Nukakun'' a-akun ovo, ''Nuk''sin ait der a-awaitievat sin ait unum ''Nukak''na-ar ukun da-api. \v 27 Jon der akak noh ura bewatuv, ''Sin naunau ori bi outo-on weiin Manet ap ou-u maii naunau nuk bi detuv. \v 28 A-akati ire to-opi we-e der sak ire a-awatun. Sak ura a-awatun,sak ''Manet Na-ak'' bi sak anibep nukak wiin. ->>>>>>> 65b6ddaafe7a25292e5bce94d92f7815ade91940 +\v 26 Jon der akak noh betuk at a-av, "sak re an ati re revatim. O-on sin oir gamuk a-ak nou tate, o-ak nuk bi areipi. \v 27 Sin oir esi sumi an vitan, sak nuhainam bi muri fak an epikeretupan." \v 28 Naunau unum evo sov beteni Jodan re rato san, Jon re eherak mep devatu. \ No newline at end of file diff --git a/01/29.txt b/01/29.txt index a712c09..04ddf3f 100644 --- a/01/29.txt +++ b/01/29.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 29 Ta-oir an Jon Manet Na-ak viev aroha atu-u, "aronai, ke-en am sipsip nak Manet nukak, wen mon evo u-uh bitimetutan. \v 30 Ovo sin o-on a-am, sin oir sak sumi an vitan, nuk vanih nou ve-ein nuk tatam ta-ava sak son. \v 31 Sak nuk areim o-o tatmetim, o-on re eherak mep reravatipi, Israil sinait akak nar arik sotan." -======= -\v 29 Sin wen nuk ait auto o nuk sin ovo atin aito o kamu. Onu-un sindeip oir ait auto-on ovo nuk nak esi o-otan kamarahu a-ampepat autetep der to-otonan. Evo nuk urap o-otan kamarahu a-ampeto-on. \v 30 Nuk wanih esi meu-u mepat nak wanim esi monahur noto-on. \v 31 ''Sin'' wen ''Manet'' apahu ou-u maii wiiv ''Nuk'' atin sin unum orimewatuto-on, onu-un wen sin nuk mon evona maii, nuk mon evona maii atin , ovo nu-un nuk esi naunau mon evonu-un atin der meto-on. ''Sin''wen Manet apahu ou-u maii ''Nuk'' atin sin unum a-akak ou-u ta-ato-on. ->>>>>>> 65b6ddaafe7a25292e5bce94d92f7815ade91940 +\v 29 Ta-oir an Jon Manet Na-ak viev aroha atu-u, "aronai, ke-en am sipsip nak Manet nukak, wen mon evo u-uh bitimetutan. \v 30 Ovo sin o-on a-am, sin oir sak sumi an vitan, nuk vanih nou ve-ein nuk tatam ta-ava sak son. \v 31 Sak nuk areim o-o tatmetim, o-on re eherak mep reravatipi, Israil sinait akak nar arik sotan." \ No newline at end of file diff --git a/manifest.json b/manifest.json index 32b9d90..6fec199 100644 --- a/manifest.json +++ b/manifest.json @@ -52,6 +52,9 @@ "01-16", "01-19", "01-22", + "01-24", + "01-26", + "01-29", "02-03", "02-06", "02-09",