From 4e0c25fbebe8011c257e35930cf064aae08cd839 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Tue, 20 Jul 2021 20:59:03 +1000 Subject: [PATCH] Tue Jul 20 2021 20:59:02 GMT+1000 (AUS Eastern Standard Time) --- 01/01.txt | 6 +----- 01/04.txt | 6 +----- 01/06.txt | 6 +----- 01/09.txt | 6 +----- 01/12.txt | 6 +----- 01/15.txt | 6 +----- 01/17.txt | 6 +----- 01/20.txt | 6 +----- 01/21.txt | 6 +----- 01/24.txt | 6 +----- 10 files changed, 10 insertions(+), 50 deletions(-) diff --git a/01/01.txt b/01/01.txt index b3a2b8dc..dcefc3f6 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 Tiopilusi, feyapa agantukauna yaufimi, semi yiyimidukau maside yoganti mare bem, yiyimiduka. \v 2 Koti inarufa abigem uri nuram mareduka mini anene fa'warimi ake waya nampa eram baya yiymi duka. Ayo aga anoni eraka beyi yogam waita yu yiyimiduka. \v 3 Naemi fu'bugapikem yera'dem itave, bemi fa'warubem beyi akunu yugaka kam waita en wayawam yakagami inaru magu yanti yiyimiduka. -======= -\c 1 \v 1 Tiopilus, feyapa agantukauna yaufimi semi siyimidukau maside yoganti mare bem, siyimiduka. \v 2 Koti Inarufa abigem uri nuram mareduka mini anene fawarimi ake waya nampa eram baya siyimiruka. Ayo aga anon eraka beyi yogam waita siyimika. \v 3 Naem mi fubugapike yeradem itavem bemi fawarubem beyi akunu yugaka. Kam waita wa'yawam yakagami Inaru magu fai siyimiduka. ->>>>>>> 1f9fbaf465a6dc38d8b4a3cedc2d626d3dbc6364 +\c 1 \v 1 Tiopilus, feyapa agantukauna yaufimi semi siyimidukau maside yoganti mare bem, siyimiduka. \v 2 Koti Inarufa abigem uri nuram mareduka mini anene fawarimi ake waya nampa eram baya siyimiruka. Ayo aga anon eraka beyi yogam waita siyimika. \v 3 Naem mi fubugapike yeradem itavem bemi fawarubem beyi akunu yugaka. Kam waita wa'yawam yakagami Inaru magu fai siyimiduka. \ No newline at end of file diff --git a/01/04.txt b/01/04.txt index 59c0eb38..316ca1bc 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Yenampa managa bemi yiyimemi semi jerusalemi yera buba rago, yige yifo'e ni baya gaga rafisego, mini yanti manisrem siruka, sepake a'i intaruka. \v 5 Jonimi nonako yigemi mane fe'duka, afo naemi ayo iyanako fe'yikatem. -======= -\v 4 Yenampa managa bemi siyimemi semi Jerusalemi yera buba rago, sige yifoe ni waya gaga dafisego, mini yanti mani sirem siruka, sepakem ai intane. \v 5 Ugami Joni mi nonako nomi feyikaka yigemi Ayo aganampa feganagon naem mana'a kanai yakagana'i. ->>>>>>> 1f9fbaf465a6dc38d8b4a3cedc2d626d3dbc6364 +\v 4 Yenampa managa bemi siyimemi semi Jerusalemi yera buba rago, sige yifoe ni waya gaga dafisego, mini yanti mani sirem siruka, sepakem ai intane. \v 5 Ugami Joni mi nonako nomi feyikaka yigemi Ayo aganampa feganagon naem mana'a kanai yakagana'i. \ No newline at end of file diff --git a/01/06.txt b/01/06.txt index 1fb98893..33172935 100644 --- a/01/06.txt +++ b/01/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Manafim bemi intaemono, Ano'na o, aga mana nura na Israilimi mante ategate wafo simi? \v 7 Ma'nisirem yiyimem, yigenti anene iwa, ite kana wafi ite nura Koti beyaga amira intaruka . \v 8 Aiyo iya onti eka yina eranti maremi seka,'i sinonami Jerusalemi nampa judia masidepa bemi Samaria nampa maside mana magaga bitem. -======= -\v 6 Masiduyu managa duwantu uvemi intaemi semi, anona'o ai kanayi emino Israel magumi manta yerade itarano. \v 7 Manisirem yiyimiduka, yigenti anene buwa, nante kunami bu intaga, senuya sifoe kana makami, beyaga intaga. \v 8 Yigemi ake'i maranago, Ayo aga'o yigeka kuminatem. Semi yigemi Jerusalemi sofainago maside Judiawa, Samariawa mana maga oma kipananika. ->>>>>>> 1f9fbaf465a6dc38d8b4a3cedc2d626d3dbc6364 +\v 6 Masiduyu managa duwantu uvemi intaemi semi, anona'o ai kanayi emino Israel magumi manta yerade itarano. \v 7 Manisirem yiyimiduka, yigenti anene buwa, nante kunami bu intaga, senuya sifoe kana makami, beyaga intaga. \v 8 Yigemi ake'i maranago, Ayo aga'o yigeka kuminatem. Semi yigemi Jerusalemi sofainago maside Judiawa, Samariawa mana maga oma kipananika. \ No newline at end of file diff --git a/01/09.txt b/01/09.txt index b9db1a70..263b7089 100644 --- a/01/09.txt +++ b/01/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Jisasi asevem bami konamano yemi avigem uremi konamano yema ukurem yigauka avigem urem. \v 10 Inarufa kagade bami kam baita kantano efar unampado nampa itagenta benta se, \v 11 Yige Galili waita yu, nayeyara itage be inarufa kagade bege? Jisasi Inarufa ukam waita or'adem yitem mana'yom ayika yitem. -======= -\v 9 Jisasi mini wayayu siyimidem, Inarufa uremi, masideyu Inarufa kagademi wami mana konamano yera uyadami enawa bu aimonemo. \v 10 Mente bipa inami amonave wami, mini ame'ama uremi kam wata ganta efaunam wado urem karo yen yianpa itave tamo. \v 11 Mani sentamonto, yige Galili watayu nayeyara yige intage bega Inarufa amone bega? Mini Jisasi, Kotimi yararem yige pake abigami Inarufa bemi orarem miyi'o abi'awa pim efa unam wa'do nampa yitemi. ->>>>>>> 1f9fbaf465a6dc38d8b4a3cedc2d626d3dbc6364 +\v 9 Jisasi mini wayayu siyimidem, Inarufa uremi, masideyu Inarufa kagademi wami mana konamano yera uyadami enawa bu aimonemo. \v 10 Mente bipa inami amonave wami, mini ame'ama uremi kam wata ganta efaunam wado urem karo yen yianpa itave tamo. \v 11 Mani sentamonto, yige Galili watayu nayeyara yige intage bega Inarufa amone bega? Mini Jisasi, Kotimi yararem yige pake abigami Inarufa bemi orarem miyi'o abi'awa pim efa unam wa'do nampa yitemi. \ No newline at end of file diff --git a/01/12.txt b/01/12.txt index c7d21f8b..75d94040 100644 --- a/01/12.txt +++ b/01/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Olivi anugakem owaye'de Jerusalemi yiga, Jerusalemi ade'ka Sabati kanaga. \v 13 Ora'de yemi yanafa naupa ba. Minifimi Pita, Joni, Jemsi, Filipi ,Tomasi Alfiusi aga ifo Saimoni Liloti nampa Judasi emsi nanim. \v 14 Yemi mana intika yigau mukirante yiga anasiyu nampa Meri Jisasi nano'e nampa ben afa awa unan nampa. -======= -\v 12 Mana waya wam mantemi Olivi anugakem Jerusalemi kumemo Oliv anumi Jerusalemi adekai. \v 13 Orade yera bemi, yanafa naupa yemo wae wae naupa uka. Yen yivi'i manuga; Pita, Joni, Jemisi, Filapi, Tomasi, Batolomyu, Matiu, Jemisi Alfusi agai, Sainoni Salotini akupikemi ya Judasi Jemisi agai. \v 14 Masideyu duwantu uwemi era yogam mukemo, anasiyu nampa Maria Jisasi anoe nampa beafa nampa. ->>>>>>> 1f9fbaf465a6dc38d8b4a3cedc2d626d3dbc6364 +\v 12 Olivi anugakem owaye'de Jerusalemi yiga, Jerusalemi ade'ka Sabati kanaga. \v 13 Ora'de yemi yanafa naupa ba. Minifimi Pita, Joni, Jemsi, Filipi ,Tomasi Alfiusi aga ifo Saimoni Liloti nampa Judasi emsi nanim. \v 14 Yemi mana intika yigau mukirante yiga anasiyu nampa Meri Jisasi nano'e nampa ben afa awa unan nampa. \ No newline at end of file diff --git a/01/15.txt b/01/15.txt index 74a35078..d201dcd9 100644 --- a/01/15.txt +++ b/01/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Mini nurami Pitami yimakuku ewa watanasi yi'wanapim itarem bage'em uga. Yantami masidepa 120 a inimwaita bami ma'ni sire siga. \v 16 Afa awa'o semi awoguge, wayami yaufim agantuka. Kotimi faka fa'waritem, Feyapa ayo aga ano Devitini oyamuka fa'warurem Judasi augaka sem . -======= -\v 15 Mini nurami Pitami yimakuku ewam watayu yiwana itare wage'en uga, yantami masidepa'i 120 inim waitami manisire siga. \v 16 Afa awa'o semi, awoguge semi wayami yaufim agaka Koti faka fawa ritemi feyapa Ayo aga'ano Deviti oyamuka fawarem semi Judasi awauka semi, mini watamano yigantinami Jisasimi fakatemo. ->>>>>>> 1f9fbaf465a6dc38d8b4a3cedc2d626d3dbc6364 +\v 15 Mini nurami Pitami yimakuku ewam watayu yiwana itare wage'en uga, yantami masidepa'i 120 inim waitami manisire siga. \v 16 Afa awa'o semi, awoguge semi wayami yaufim agaka Koti faka fawa ritemi feyapa Ayo aga'ano Deviti oyamuka fawarem semi Judasi awauka semi, mini watamano yigantinami Jisasimi fakatemo. \ No newline at end of file diff --git a/01/17.txt b/01/17.txt index d292c287..e39ab0ab 100644 --- a/01/17.txt +++ b/01/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Nayeyara senu nampa mana akupim mini yoganti mantuka. \v 18 Mage mini waita maga aya ure mini kutanu moni nako, I'naemi magaga a'nopakem kuma dufamemi ara'i ra'wantarem fasagi em. \v 19 Jerusalemi bam masidem inim waita intaga , yeya fike minimagu abidaremi Akeldama, mini abi ano semi nare bam amgufim. -======= -\v 17 Naiyeyara senu nampa mana akupim wa, seyunam yogewa. \v 18 Magemi mini wata mano maga aya'emi mini kutanu mone nako. I'naemi magagai anopa kuma dufamemi. arai dawantave fasayi em. \v 19 Jerusalem bam masidem inim wata intaga yeya fike mini magu abidemi (Alkeldama) mini abi'ano semi nare bam magabe. ->>>>>>> 1f9fbaf465a6dc38d8b4a3cedc2d626d3dbc6364 +\v 17 Naiyeyara senu nampa mana akupim wa, seyunam yogewa. \v 18 Magemi mini wata mano maga aya'emi mini kutanu mone nako. I'naemi magagai anopa kuma dufamemi. arai dawantave fasayi em. \v 19 Jerusalem bam masidem inim wata intaga yeya fike mini magu abidemi (Alkeldama) mini abi'ano semi nare bam magabe. \ No newline at end of file diff --git a/01/20.txt b/01/20.txt index c90f7e75..e67db532 100644 --- a/01/20.txt +++ b/01/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Buk sonifim agantem sem, e'ana maside beni yanta kipa. Mana waita e'ana fa iwa, E'ana eno beni yoganti marano. -======= -\v 20 Minugami Kotini wayamano i'anoni yaufimi agaka, e'anam masidem beni yanta kipa. Mana wata e'anam fa iwa, mini nana ena watamano beni eranampa yoga namp mara. ->>>>>>> 1f9fbaf465a6dc38d8b4a3cedc2d626d3dbc6364 +\v 20 Minugami Kotini wayamano i'anoni yaufimi agaka, e'anam masidem beni yanta kipa. Mana wata e'anam fa iwa, mini nana ena watamano beni eranampa yoga namp mara. \ No newline at end of file diff --git a/01/21.txt b/01/21.txt index 662aa5cb..9edae48c 100644 --- a/01/21.txt +++ b/01/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 Minimi awogu ugem, mana waita mano maside nuram senu nampa bem senuti Ano'na Jisasi senu yi'wanapa bem. \v 22 Joni nom fe'aka nurakake yem inarufa abigem uka nuram senu amonarukafu bemo itagami. \v 23 Kam waita manta itaremono, Josepi nampa Barabasi beni ena avi'i Jastusi nampa Matiasi. -======= -\v 21 Mini avogu ugem, mana watamano maside nuram senu nampa , bemi anona Jisasi senuya siwanapa bemi. \v 22 Joni mono'nom maraka yem Kotimo bemi yeradim abiruka. Senupakemi, bemi sima fawarinani beni fuginti. \v 23 Kam wata manta itaremo, Josepi abidemo Basabasi ya mana abi'i Jastusimi ya Matias. ->>>>>>> 1f9fbaf465a6dc38d8b4a3cedc2d626d3dbc6364 +\v 21 Mini avogu ugem, mana watamano maside nuram senu nampa , bemi anona Jisasi senuya siwanapa bemi. \v 22 Joni mono'nom maraka yem Kotimo bemi yeradim abiruka. Senupakemi, bemi sima fawarinani beni fuginti. \v 23 Kam wata manta itaremo, Josepi abidemo Basabasi ya mana abi'i Jastusimi ya Matias. \ No newline at end of file diff --git a/01/24.txt b/01/24.txt index 711668a3..d9904afe 100644 --- a/01/24.txt +++ b/01/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Yigau mukeve ma'nisiga, Emi ano'namano maside inim waita yira'i amonaganam mini kanto itarukana fikemi mana wayina. \v 25 Yoganti mantukemi Kotini yoganti maratemono Judasini magumi, bemi yerarem bemi wararem si magufa'i bem. \v 26 Yiyan intafemo iye mi yoganti maratenafi. Watanasi aruma dateremono, 11 ni'a waita yunampa mono yogari emo. -======= -\v 24 Yugam mukeve manisiga, em anonamano, maside inim wata yira'i amonaga nam mini kanto itarukana fikemi manawa yina. \v 25 Yoganti mantukemi Kotini yoganti maratemo Judasimi maguga , bemi yerarem bemi warare si magufai bemi. \v 26 Yiyam intafemo, iye mi yoganti maratenafi. Matiasimi aruma dateremo 11 ni'a watayunampa mono yogari emo. ->>>>>>> 1f9fbaf465a6dc38d8b4a3cedc2d626d3dbc6364 +\v 24 Yugam mukeve manisiga, em anonamano, maside inim wata yira'i amonaga nam mini kanto itarukana fikemi manawa yina. \v 25 Yoganti mantukemi Kotini yoganti maratemo Judasimi maguga , bemi yerarem bemi warare si magufai bemi. \v 26 Yiyam intafemo, iye mi yoganti maratenafi. Matiasimi aruma dateremo 11 ni'a watayunampa mono yogari emo. \ No newline at end of file