From 977678f9d7c9ee016e69554038a91e276793592a Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Fri, 3 May 2019 22:37:00 +1000 Subject: [PATCH] Fri May 03 2019 22:37:00 GMT+1000 (West Pacific Standard Time) --- 01/10.txt | 6 +----- 01/12.txt | 6 +----- 01/14.txt | 6 +----- 02/01.txt | 6 +----- 02/title.txt | 6 +----- manifest.json | 5 +++++ 6 files changed, 10 insertions(+), 25 deletions(-) diff --git a/01/10.txt b/01/10.txt index 21d8bcb..c64348b 100644 --- a/01/10.txt +++ b/01/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Nuk mon unum an ta-av, o-ok mon unum nuk ura-av, o-ok mon unum nukakun bi to-opi. \v 11 Nuk nukautou wite, sin oir nuk bi aipi. -======= -\v 10 Manet Na-ak Nikodimas nukak der noh betuv. "Nak Israil akak Tisa.we-en ainam naunau sak a-am ovo nak bi to-om." \v 11 Kukuhu ainam a-asim ,ik naunau to-on usa etimu nouan der meimu. nou naunau ik aron usa etimu nouan der meimu,onu-un ak naunau ik a-amu ovo nak bi to-om." ->>>>>>> 65b6ddaafe7a25292e5bce94d92f7815ade91940 +\v 10 Nuk mon unum an ta-av, o-ok mon unum nuk ura-av, o-ok mon unum nukakun bi to-opi. \v 11 Nuk nukautou wite, sin oir nuk bi aipi. \ No newline at end of file diff --git a/01/12.txt b/01/12.txt index e8e34f7..a26f9ce 100644 --- a/01/12.txt +++ b/01/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Wei-in keneibi nuk a-av, wen wanih nukak kakati tahumep, on Manet Na-ak sotonain vanih devatu-uv. \v 13 Sinait amiyek -bep im an bi soite , Manet nukak to-op an bi so-ov. -======= -\v 12 We-in ak kukuhu bi to-orutonain,mon evo nukak naunauan sak ire a-avwatun ovo.Atera ak kukuhu to-otona naunau ou-u "Mem'' Apahuan ta-api sak a-awatan? \v 13 Sin oir "Mem" Apahuan o-ou oir bi ukuv. We-in sin wen ''Mem''Apahu o-ou mai-i ni-iv ovo nuk '''Sin Na-ak''. ->>>>>>> 65b6ddaafe7a25292e5bce94d92f7815ade91940 +\v 12 Wei-in keneibi nuk a-av, wen wanih nukak kakati tahumep, on Manet Na-ak sotonain vanih devatu-uv. \v 13 Sinait amiyek -bep im an bi soite , Manet nukak to-op an bi so-ov. \ No newline at end of file diff --git a/01/14.txt b/01/14.txt index 63432f4..582ccbd 100644 --- a/01/14.txt +++ b/01/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Der sin amesoa kamuk iknou tate. Ikkakati meu nukak nou wani meu nukakareimu. Na owowani memak nar mai wite, nuk der kuruhu nou ou epor an amepeite. \v 15 Jon nuk veat der ura arikeite, ovo sin wen sak nukaukun am, nuk sak sumi an vitan, nuk vani nou, wei-in nuk ire tau sak bi sop. -======= -\v 14 Moses mat ap maupan mai-i auv ou-u etuv iwei,i-im ovo iwei ''Sin Na-ak''wanih o-uv etutonain. \v 15 Wen sin ait unum ''Nukakun'' ura isetutona,O nukak esi ehera-akmep nu-uhu as as tato-on autonaiin. ->>>>>>> 65b6ddaafe7a25292e5bce94d92f7815ade91940 +\v 14 Der sin amesoa kamuk iknou tate. Ikkakati meu nukak nou wani meu nukakareimu. Na owowani memak nar mai wite, nuk der kuruhu nou ou epor an amepeite. \v 15 Jon nuk veat der ura arikeite, ovo sin wen sak nukaukun am, nuk sak sumi an vitan, nuk vani nou, wei-in nuk ire tau sak bi sop. \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index 88ecfee..fab2e55 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 as it ire ugievat gabametup oir ire kana vap galili,Manet nag anak oha vana tau. \v 2 manet Na -======= -\c 2 \v 1 As it ire ugievat, kabametup oir ire kana vap Galili, Manet Nak anak oha vana tau. \v 2 Manet Nak disaipel nukak no vevatupek kabametup an ugutonain. ->>>>>>> da5685ef61a7b841a36c703fd7d03ea575065315 +\c 2 \v 1 As it ire ugievat, kabametup oir ire kana vap Galili, Manet Nak anak oha vana tau. \v 2 Manet Nak disaipel nukak no vevatupek kabametup an ugutonain. \ No newline at end of file diff --git a/02/title.txt b/02/title.txt index a25236f..1c3d47c 100644 --- a/02/title.txt +++ b/02/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Anibep arit -======= -ANIBEB: 2 ->>>>>>> da5685ef61a7b841a36c703fd7d03ea575065315 +ANIBEB: 2 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 6fec199..b8bfc5b 100644 --- a/manifest.json +++ b/manifest.json @@ -49,12 +49,17 @@ "01-04", "01-06", "01-09", + "01-10", + "01-12", + "01-14", "01-16", "01-19", "01-22", "01-24", "01-26", "01-29", + "02-title", + "02-01", "02-03", "02-06", "02-09",