From 9eb4352a733ec588faf043573d60a549690a1557 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Tue, 27 Jun 2023 14:09:48 +0900 Subject: [PATCH] Tue Jun 27 2023 14:09:48 GMT+0900 (Japan Standard Time) --- 01/10.txt | 6 +----- 01/24.txt | 6 +----- 01/26.txt | 6 +----- 01/28.txt | 6 +----- 01/30.txt | 6 +----- 02/01.txt | 6 +----- 02/03.txt | 6 +----- 02/06.txt | 6 +----- 02/08.txt | 6 +----- 02/10.txt | 6 +----- 02/12.txt | 6 +----- 02/14.txt | 6 +----- 02/title.txt | 6 +----- 03/01.txt | 6 +----- 03/03.txt | 6 +----- 03/06.txt | 6 +----- 03/08.txt | 6 +----- 03/10.txt | 6 +----- 03/12.txt | 6 +----- 03/14.txt | 6 +----- 03/16.txt | 6 +----- 03/18.txt | 6 +----- 03/21.txt | 6 +----- 04/01.txt | 6 +----- 04/03.txt | 6 +----- 04/05.txt | 6 +----- 04/06.txt | 6 +----- 04/08.txt | 7 +------ 04/10.txt | 6 +----- 04/12.txt | 6 +----- 30 files changed, 30 insertions(+), 151 deletions(-) diff --git a/01/10.txt b/01/10.txt index 64293bb..5304d0d 100644 --- a/01/10.txt +++ b/01/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Menaye, wete a sekrete we senamare do keka-do keka Tuhan kna Eido tante we metelrena ne ambai te. elrembe netenate wena nelrone kna momotena ambai. Nepelrati we mbeite mendo mbeite eute dununumbe. \v 11 Nemane sate odena yereu detena snaitepuko delrei do keka, kloe nei mie deko odena nelrowe a sangku te dianu, dena -======= -\v 10 Menaya,wete a sekrete snamare,dokeka-dokeka Tuhan kna Eido tante we metelrena ne AMbai te Elrembe netenate wena nelrone kna momotena ambai,neperlati we mbeite mendo mbeite eute dununnumbe. \v 11 Nemane sate,ovena yereu detena snaitepuko delrei do keka,kloe nei miedeko,A sangkute dianu,dena. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 10 Menaya,wete a sekrete snamare,dokeka-dokeka Tuhan kna Eido tante we metelrena ne AMbai te Elrembe netenate wena nelrone kna momotena ambai,neperlati we mbeite mendo mbeite eute dununnumbe. \v 11 Nemane sate,ovena yereu detena snaitepuko delrei do keka,kloe nei miedeko,A sangkute dianu,dena. \ No newline at end of file diff --git a/01/24.txt b/01/24.txt index d663eb8..11ead06 100644 --- a/01/24.txt +++ b/01/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 nepelre lati Yunani detelro Kristus Mang Walri nepelre lati Mang yambu. \v 25 Mang Walri kenalre pelro-pelrotelre , detelro tena mendo eutelre Mang Walri kenalre wakembanya, detelro tena wake dopelre. -======= -\v 24 Wemaneye da kembalrite simipukona Yahudi detelro neperlati Yunani detelro Kristus many waka neperlari mangyambu. \v 25 Mang walre pro pro protelre detelro tena mendoEutelre mangwalri knalre wakembainyedetelro tena wake dopelre. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 24 nepelre lati Yunani detelro Kristus Mang Walri nepelre lati Mang yambu. \v 25 Mang Walri kenalre pelro-pelrotelre , detelro tena mendo eutelre Mang Walri kenalre wakembanya, detelro tena wake dopelre. \ No newline at end of file diff --git a/01/26.txt b/01/26.txt index 9e00f25..cec3e26 100644 --- a/01/26.txt +++ b/01/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Wei eute te tembe nedaine wete simipuko, dokeka eu endung kalrote mendo yelrikoipai , belrengka te nekenai telrengbai nepelrelati bete nekenaina telreng bai lati. \v 27 Nepelre lari Mang Walri da yobulrana pelroplrotelre elripuko mendona detelro te paita bulrete, nepelrelati beyusa bete wake nate paita bulrete. -======= -\v 26 Wei Eute tembe nedaine wete simifuko,dokeka Eu endung kalrote mendo yerikoipae,Berengka te nekenai terengbai nepulati bete neknaina tereng bai lati. \v 27 Neperlati mang walri dayobulra na proprotelre te Elripuko mendona detelro te paita burete,neperlati beyusabete wake ambai da yobulrane,wakenate paitabulrate. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 26 Wei eute te tembe nedaine wete simipuko, dokeka eu endung kalrote mendo yelrikoipai , belrengka te nekenai telrengbai nepelrelati bete nekenaina telreng bai lati. \v 27 Nepelre lari Mang Walri da yobulrana pelroplrotelre elripuko mendona detelro te paita bulrete, nepelrelati beyusa bete wake nate paita bulrete. \ No newline at end of file diff --git a/01/28.txt b/01/28.txt index 6bca773..47a2717 100644 --- a/01/28.txt +++ b/01/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Nepelre lati Mang Walri dayobulrana me beipainya da eina atelrena nemane lati metelrena kalro mebepainya, metelrena eupelrena saisaisite baite sumbone. \v 29 Netenate detelro mbei-mbei nenei delrete Mang Walri kena bukouna elripai. -======= -\v 28 Nepellati mangwalre dayobulrana me beipainya,dru Eina atelvena nehrane lati metelrana kalro mebeipainya,metelreina Eipelrena sasyaasy te baite sumbone. \v 29 Netenate detelro mbei-mbei nenei delrete mangwalri kna bukouna Elripai. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 28 Nepelre lati Mang Walri dayobulrana me beipainya da eina atelrena nemane lati metelrena kalro mebepainya, metelrena eupelrena saisaisite baite sumbone. \v 29 Netenate detelro mbei-mbei nenei delrete Mang Walri kena bukouna elripai. \ No newline at end of file diff --git a/01/30.txt b/01/30.txt index f1162fa..8a35dc2 100644 --- a/01/30.txt +++ b/01/30.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 30 Ne sate, we Yesus Kristus Kena eine mekomambone. \v 31 Nemane, netenate biyamena detelro nei delrete elrendena Tuhan Kena eine nei delrete elrende. -======= -\v 30 e sate,we Yesus Kristus knaEine mekomambone yambu,Telpelre,mromro neperlati sukui sukui mang walri kenalre. \v 31 Nemaneye,netenate,biyamena detelro neli delrete Elrendena Tuhan kena Eine nei delrete Elrende. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 30 Ne sate, we Yesus Kristus Kena eine mekomambone. \v 31 Nemane, netenate biyamena detelro nei delrete elrendena Tuhan Kena eine nei delrete elrende. \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index cf1489d..a425be7 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Nepelre, nedaine de wokote miyalre, dokeka- dokeka de metelrena a delre motena ambai nepelrelati yambu Mang kna yena a, wete santemelre. \v 2 Nemane, de tiyekukalre wena nelrone bete nimeipai, nekalrotena Yesus Kristus salibne bepaipukona. -======= -\c 2 \v 1 Nepelre,nedaine de wakote milyalre,pokeka dokeka de metelrena a delre motena ambai neperlati yambu mangkna yena a,wote santemelre. \v 2 Nemaneye,de tiyekedkalre wena nelrone bete nimeipai,nekaltena Yesus Kristus,salib ne bepai pekona. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\c 2 \v 1 Nepelre,nedaine de wakote milyalre,pokeka dokeka de metelrena a delre motena ambai neperlati yambu mangkna yena a,wote santemelre. \v 2 Nemaneye,de tiyekedkalre wena nelrone bete nimeipai,nekaltena Yesus Kristus,salib ne bepai pekona. \ No newline at end of file diff --git a/02/03.txt b/02/03.txt index 607c669..200286e 100644 --- a/02/03.txt +++ b/02/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 De wembelre nemanemo, wakembai nelrone, endiki eine, nepelre kasopelre titeyaite. \v 4 A elralrena, nepelre A senamalrena yambu eina A ambai, wete telrepelretelre elrembe, nemane , hei nolrulre alru nepelre delre kalro. \v 5 Netenate, wei telrepelre, detelro kena yambu na ambai, netena Mang Walri kena delre kalrone. -======= -\v 3 De wembelre nemanemo wakembai nelrore,Endiki Eine nepelre kasoplre titeyaite. \v 4 A elrama nepelre a snamarna yambu Eina ambai we telpelrete Eerembe,Nemaneye,hei noupelre ALru napelre delre kalro. \v 5 Netanate,wei telpelre,detelro kna yambu na ambai,netena mangwalri kna delre kalrone. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 3 De wembelre nemanemo wakembai nelrore,Endiki Eine nepelre kasoplre titeyaite. \v 4 A elrama nepelre a snamarna yambu Eina ambai we telpelrete Eerembe,Nemaneye,hei noupelre ALru napelre delre kalro. \v 5 Netanate,wei telpelre,detelro kna yambu na ambai,netena mangwalri kna delre kalrone. \ No newline at end of file diff --git a/02/06.txt b/02/06.txt index 49e16d7..3fde91e 100644 --- a/02/06.txt +++ b/02/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 De yambu te senanemelre detelro yekote, nemna lati da yaselrei mewena yambu ambai, nepelre lati detelro delre-delre dayaselreite nepe peko te mekonemelre. \v 7 Nemane de Mang yambute bulrumeye senamalre yambu yatelrena, Mang Walri tiyekuko yansite tutena yate. -======= -\v 6 Ye yambute snanemelre detelro,Nemalati dayasrei mewena yambu ambai,Neperlati detelro delre dayasreite nepe peho te mekonemelre. \v 7 Nemaneye de mang yambute bulrumiye snanemelre,yambu yetelrena,many walri tiyekuko yansite tutena yate. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 6 Ye yambute snanemelre detelro,Nemalati dayasrei mewena yambu ambai,Neperlati detelro delre dayasreite nepe peho te mekonemelre. \v 7 Nemaneye de mang yambute bulrumiye snanemelre,yambu yetelrena,many walri tiyekuko yansite tutena yate. \ No newline at end of file diff --git a/02/08.txt b/02/08.txt index 46bebd6..b9366ca 100644 --- a/02/08.txt +++ b/02/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Detelro delre-delre da yaselreitena nimeipai, nemane ne nepe nimeyaimbeko, nimeipaitena Yesus tena salibna bapipai. \v 9 Nemane lati, semona melraipukona: " Dau eine itipaina sa, nepelre buntikei betepelre betopainya nepelre detelro yena kenane tuwaipainya, ne metelrena Mang Walri kelropuko detelro Mang Walrite kenabise eine" -======= -\v 8 Detelro delre-delre da yaseraitena nimeipai,nemaneye ne nepe nimeiyoimbeko,himupai painatena Yesustena salibna babtpai. \v 9 Nemanelati,semona malraipekona "dau Eine itipaina sa,nepelre buntukei betepelre betopainya nepelre detelro yena kunane tuwaipaina,ne metelrena mang walri kelropuko detelro mang walrite kenabise tine" ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 8 Detelro delre-delre da yaseraitena nimeipai,nemaneye ne nepe nimeiyoimbeko,himupai painatena Yesustena salibna babtpai. \v 9 Nemanelati,semona malraipekona "dau Eine itipaina sa,nepelre buntukei betepelre betopainya nepelre detelro yena kunane tuwaipaina,ne metelrena mang walri kelropuko detelro mang walrite kenabise tine" \ No newline at end of file diff --git a/02/10.txt b/02/10.txt index 78b60be..644cce5 100644 --- a/02/10.txt +++ b/02/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Nemane ye, Mang Walri da kalro etena Alru Walrolre saneyonu alru metelrena kalro keyatelre ne. nemane lati Mang Walri kena kote. \v 11 Nemane sate, detelro sime detelro kena nelrone metelrena saisasite nimeiyembuko, detelro kena alru eueine? nemane lati detelro sibetemena Mang Walri kena eine saisasi betepelre nimeipai nekalrotena nei Mang alrumbeimo. -======= -\v 10 Nemaneye! mang walri da kalro etena so Alru walrore saneyamu Aru metelrena kalro kyadelre ne, nemanelati mangwalri kna kote. \v 11 nemanesate,detelro sime detelro kena kna nelrone metelrena syasasyite nimeinumbuko,detelro kna alru eyeine? Namane lati detelro sibetemena mang walri kena eine syazasyi betepelre nimeipai nekalrotena nei mang Alrumbeimo. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 10 Nemaneye! mang walri da kalro etena so Alru walrore saneyamu Aru metelrena kalro kyadelre ne, nemanelati mangwalri kna kote. \v 11 nemanesate,detelro sime detelro kena kna nelrone metelrena syasasyite nimeinumbuko,detelro kna alru eyeine? Namane lati detelro sibetemena mang walri kena eine syazasyi betepelre nimeipai nekalrotena nei mang Alrumbeimo. \ No newline at end of file diff --git a/02/12.txt b/02/12.txt index e771166..7079724 100644 --- a/02/12.txt +++ b/02/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Da selreitena e yatiyandena da yobulrana alru ambai, nemena tena alru Mang kena netenate Mang Walri eteyatumuna kalrote nimeimalre. \v 13 Metelrena kalro ane elrandena ne a kalro detelro yambu kilripaina, nemena tena alru kilrinde metelrena saisasi walri kalrotena nepelre, walri atena. -======= -\v 12 Da sreitena E yatiyandena da yebulrana Alru ambai,nemena tena Alru mangkna netenate mangwalri eteyatumuna kalrote nimeimalre. \v 13 Metelrena kalro ane elrandena ne akalro detelro yambu kilripdi na,nemena tena Alru kilrinde metelrena syazasyasi walri kavotena neperle,walri atena. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 12 Da sreitena E yatiyandena da yebulrana Alru ambai,nemena tena Alru mangkna netenate mangwalri eteyatumuna kalrote nimeimalre. \v 13 Metelrena kalro ane elrandena ne akalro detelro yambu kilripdi na,nemena tena Alru kilrinde metelrena syazasyasi walri kavotena neperle,walri atena. \ No newline at end of file diff --git a/02/14.txt b/02/14.txt index 1e971e3..4f932ef 100644 --- a/02/14.txt +++ b/02/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Nemane, detelro telrepelre nikipainya, metelrena kalro Mang Walri kenarena ne nimeipai ne kalrote netena pelropelro telre, nemane lati nekalrotena telrepelre eine nimeyaina. \v 15 Detelro telrepelre eine, metelrena kalrote nimeyaiye, nei eitena detelro simena betepelre nimeipai. \v 16 Nemane, sime Mang Walri kena mendote nimeiyumbuko nete ate sanenenlre, nemane de Kristus kena mendote tepande. -======= -\v 14 Nemaneye,detelro telpelre nikipainya,metelrena kalro mang walri kna rena ne nimeipai,nekalrot netena propro telre,nemane keti nekalrotena telpelre Eine nimeyaina. \v 15 Detelro telpelre Eine,metelrena kalrote nimei yaiye,nei eutena detelro simena betepelre nimeipai. \v 16 Nemane,sime mang walri kna mendote nimeiyumbuk nete ate sanenenlre,nemaneye,de Kristus kna mendote tepande. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 14 Nemaneye,detelro telpelre nikipainya,metelrena kalro mang walri kna rena ne nimeipai,nekalrot netena propro telre,nemane keti nekalrotena telpelre Eine nimeyaina. \v 15 Detelro telpelre Eine,metelrena kalrote nimei yaiye,nei eutena detelro simena betepelre nimeipai. \v 16 Nemane,sime mang walri kna mendote nimeiyumbuk nete ate sanenenlre,nemaneye,de Kristus kna mendote tepande. \ No newline at end of file diff --git a/02/title.txt b/02/title.txt index d18ec8e..bf783de 100644 --- a/02/title.txt +++ b/02/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Pasal -======= -Pasal 2 ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +Pasal 2 \ No newline at end of file diff --git a/03/01.txt b/03/01.txt index 76a7cb2..33de5aa 100644 --- a/03/01.txt +++ b/03/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Nemane, dokeka-dokeka, de betepelre wetena A" elripai na da yobulrana detelro, yeisai-sai mane Kristus kena eine. \v 2 De wetena Malrisa kongbu te yatemalre, sa yatipai neseleitena yatikoipai da selreitena nemane lati yelrikoipai. -======= -\c 3 \v 1 Nemane,dokeka-dokeka de betepelre wetena A'elripai na da yabulrana detelro,Yei sa-sai mane Kristus kna Eine. \v 2 De wetena malri zu kongbu te yatemalre,sa yatipai,nesreitena yerikolpai da srutena nemanelasi yerikoipai ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\c 3 \v 1 Nemane,dokeka-dokeka de betepelre wetena A'elripai na da yabulrana detelro,Yei sa-sai mane Kristus kna Eine. \v 2 De wetena malri zu kongbu te yatemalre,sa yatipai,nesreitena yerikolpai da srutena nemanelasi yerikoipai \ No newline at end of file diff --git a/03/03.txt b/03/03.txt index 894480b..2ab7110 100644 --- a/03/03.txt +++ b/03/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 We dayobulrana eu mane nepelre detelro yelreu mane? \v 4 Nemane sate detelro si elrende de paulus kena sune, nepelre lati de Apolos kena sune, nemetena, we detelro? \v 5 Nemena Apolos kaye sime nepelre Paulus kaye sime" Walri kembalri detelro nolruna we telrepelre te doukawe Mang ne momo waseyomuna mane. -======= -\v 3 We dayobulrana Eumane ne sate,kilri yembe,mendo yaisu yasu wena nelrone,yabulrana yekomane,nepelre detelro yereu mane? \v 4 Nemenasate,detelro si Elrende,de Paulus kna sune,neperlati si,de Apolos knasune,nemenatena,we kanye detelro? \v 5 Nemena,Apolos kayesime? Nepelre Paulus kaye sime,Walri kembalri detelro nelrena we telupelre te doukauwe,Tuhan nee momo wase yomuna mane. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 3 We dayobulrana Eumane ne sate,kilri yembe,mendo yaisu yasu wena nelrone,yabulrana yekomane,nepelre detelro yereu mane? \v 4 Nemenasate,detelro si Elrende,de Paulus kna sune,neperlati si,de Apolos knasune,nemenatena,we kanye detelro? \v 5 Nemena,Apolos kayesime? Nepelre Paulus kaye sime,Walri kembalri detelro nelrena we telupelre te doukauwe,Tuhan nee momo wase yomuna mane. \ No newline at end of file diff --git a/03/06.txt b/03/06.txt index b1d4907..7cbd490 100644 --- a/03/06.txt +++ b/03/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 De pelralre, Apolos dilrinu sotena Mang Walri neye mekowe. \v 7 Netenate, nung pelre pelraina ambai, buye dilraina ambai, nung balrewe na kalrotena Mang Walri nenei. -======= -\v 6 Deye pralre,Apolos bu deloimu,sotena mang walri neya mekowe. \v 7 Netenate,nung pelre peralna,Ambai,emeye dilrainya ambai,nung belrewena kalrotena mang walri nenei. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 6 Deye pralre,Apolos bu deloimu,sotena mang walri neya mekowe. \v 7 Netenate,nung pelre peralna,Ambai,emeye dilrainya ambai,nung belrewena kalrotena mang walri nenei. \ No newline at end of file diff --git a/03/08.txt b/03/08.txt index 89c8959..aab79e0 100644 --- a/03/08.txt +++ b/03/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Detelro sanung te pelraiyena, nepelre bute dilrainya nembei nepe, mbei-mbei nei nyalrete yatenaina, ne kembalri yaune. \v 9 Netenate De Mang Walri pelre ne kembalri mbei : we Mang emi pelre Mang miye. -======= -\v 8 Detelro sanungte pelrayena,nepelre bute delrainya nembei nepe,mbei-mbei nei nyalrete yatenaina,nei kembalri yaune. \v 9 Netenate,de mang walri pelre nekembalri mbei,we mang emi mangwalri me. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 8 Detelro sanungte pelrayena,nepelre bute delrainya nembei nepe,mbei-mbei nei nyalrete yatenaina,nei kembalri yaune. \v 9 Netenate,de mang walri pelre nekembalri mbei,we mang emi mangwalri me. \ No newline at end of file diff --git a/03/10.txt b/03/10.txt index 3e0219e..be821f1 100644 --- a/03/10.txt +++ b/03/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Nenei kembalri yaune dete yateketelre, miye kembalri detelro tiyei dopelrena mane. De kaite detalre siye bularate mekonaiye, nemane ye detelro mbei-mbei bulratena beyamane melronaiye. \v 11 Nemane, detelro mbei mena, miye kai simena betepelre detoipai. Beimo memetena detaipekona nenepe Yesus Kristus. -======= -\v 10 Nenei kembalri yaune dete yateketelre,mie kembalri detelro tiyei doprena mane. De kaite detalre siye bulrate mekonaiye,nemane ye detelro mbei-mbei bulratena biayamake meronaiye. \v 11 nemane,detelro mbeimena mie kai simeria betepelre detoipae beimo memte detoipeko na nenepe Yesus Kristus. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 10 Nenei kembalri yaune dete yateketelre,mie kembalri detelro tiyei doprena mane. De kaite detalre siye bulrate mekonaiye,nemane ye detelro mbei-mbei bulratena biayamake meronaiye. \v 11 nemane,detelro mbeimena mie kai simeria betepelre detoipae beimo memte detoipeko na nenepe Yesus Kristus. \ No newline at end of file diff --git a/03/12.txt b/03/12.txt index 9208626..511c19c 100644 --- a/03/12.txt +++ b/03/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Detelro da kai detaipekona bulrane, welraina, Emas lre, pelrak olru poi, olru, sepo, nepelre lati Jerami. \v 13 Detelro mbei-mbei kna kembalri kiyatelre, ne ya tena sing kiyane nenelre, nepelre ne sing lati kembalri mekoiyena tuwanelre detelro mbei-mbei kena kembalri. -======= -\v 12 Detelro da kai detaipekona bulrane,mranaine,emas lre,perak olru poi,olre,sepo,neperlati jerami. \v 13 Detelro mbei-mbei kna bembelri kiatelre,ne yaitena sing ye kiyane nenelre, neperlati ne sing lati kiatelre,ne yaitena sing ye luyane nenelre,neprlati ne sing lati kembalre,mekoiyena tuanenlre detelro mbei-mbei kna kembalri. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 12 Detelro da kai detaipekona bulrane,mranaine,emas lre,perak olru poi,olre,sepo,neperlati jerami. \v 13 Detelro mbei-mbei kna bembelri kiatelre,ne yaitena sing ye kiyane nenelre, neperlati ne sing lati kiatelre,ne yaitena sing ye luyane nenelre,neprlati ne sing lati kembalre,mekoiyena tuanenlre detelro mbei-mbei kna kembalri. \ No newline at end of file diff --git a/03/14.txt b/03/14.txt index 0dad289..a7975dd 100644 --- a/03/14.txt +++ b/03/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Nemane lati detelro mbei-mbei kena kembalri suwe tepembena nenei nyalre pelre inainelre. \v 15 Nemane lati ne detelro kena kembalri sing ne baite kena tembondena kembalri sa balrtukuna. Ne yeweka te melronde, nemaneye nenei eumbei te tromonaimbonde, nenei eu nekandena detelro sing tena bitoipainya mane. -======= -\v 14 Nemanelati detelro mbei-mbei kna kembali suwe tependena nenei nyalre pelre inainelre. \v 15 Nemanelati ne detelro kna kembalri sing ne baite kematembo dena kembalri sa bartukuna. Neyeweka te mronde,nemane ye nenei Eumbei te tromronaimbonde,nenei Eunekendena detdro singte binpyaina mane. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 14 Nemanelati detelro mbei-mbei kna kembali suwe tependena nenei nyalre pelre inainelre. \v 15 Nemanelati ne detelro kna kembalri sing ne baite kematembo dena kembalri sa bartukuna. Neyeweka te mronde,nemane ye nenei Eumbei te tromronaimbonde,nenei Eunekendena detdro singte binpyaina mane. \ No newline at end of file diff --git a/03/16.txt b/03/16.txt index 2d7e0c4..47dcdb4 100644 --- a/03/16.txt +++ b/03/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 Nimeipai nekawe we Mang miye, Mang kena alru wei eueine nekewe? \v 17 Beyemena tena, detelro Mang Miye te kelrombona, Mang lati nete kelrimbone, Mang miye nekewena mlro-mlro telre. -======= -\v 16 Nineipainekawu we mang mie,mang ALru wei Eueine nekewe ? \v 17 Beyamenatena,detelro many mete rembona,menlati nete krmbone,mangmie nekwena mro-mro,we nepe. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 16 Nineipainekawu we mang mie,mang ALru wei Eueine nekewe ? \v 17 Beyamenatena,detelro many mete rembona,menlati nete krmbone,mangmie nekwena mro-mro,we nepe. \ No newline at end of file diff --git a/03/18.txt b/03/18.txt index 15f8558..070b995 100644 --- a/03/18.txt +++ b/03/18.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 18 Detelro nei eutena aupeupeu tena dipainya, detelro wena nelrone nekendena mena nei mendonna detelro dayaselrei, nepene pelro-pelro dumbone netenate mendo detelro nekende. \v 19 Netenate, da yobulra yambu Mang Walri kena bukoune plro-plro netenate semone meraipeko, ne detelro mendenate nei aupeupeu eine olruwe. \v 20 Nepelrana, Mang nimeyeimbuko detelro poi kena mendo,metelrena nombainya. -======= -\v 18 Detelro nei Eutena apupentena dipainya,detelro wena Nelrone nekendena mena waspisine nei mendona detelro dayasrei,nepene propro dumbone netenate mendo detelro nekende. \v 19 Netante,da yobulra yambu mang walri kenat bukoune pro-pro netenate semone mraipeko ne detelro mendonate nei eine otsuwa. \v 20 Neperlati,Tuhan metelru nimewe mendo eutelre detroyei kri mendona metelrena noubanya. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 18 Detelro nei Eutena apupentena dipainya,detelro wena Nelrone nekendena mena waspisine nei mendona detelro dayasrei,nepene propro dumbone netenate mendo detelro nekende. \v 19 Netante,da yobulra yambu mang walri kenat bukoune pro-pro netenate semone mraipeko ne detelro mendonate nei eine otsuwa. \v 20 Neperlati,Tuhan metelru nimewe mendo eutelre detroyei kri mendona metelrena noubanya. \ No newline at end of file diff --git a/03/21.txt b/03/21.txt index 906970b..e51dfd8 100644 --- a/03/21.txt +++ b/03/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 netenate, detelro eutena delretena elripainya, nesate metelrena saisaisi metelrena neimo. \v 22 Paulus, poilati daya selreite saisaisi, nepelrelati di betunasu yangsite menaye, metelrena weimene. \v 23 Nepelre we Kristus nenei detelro, nepelre Kristus nei Mang kena -======= -\v 21 Netenate,detelro eutena delretena eloipainya,nesate metelrena syasyasi metelrena nei mo. \v 22 Paulus poi lati Apolos,poilati kefas,da yabulra na poi,nepelrati tet,poilati dayasruke syasyaszi,neperlati di batunasa yang site menaye,metenena weimene. \v 23 Nepane we Kristus nenei neperlati Kristus Allah mino. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 21 Netenate,detelro eutena delretena eloipainya,nesate metelrena syasyasi metelrena nei mo. \v 22 Paulus poi lati Apolos,poilati kefas,da yabulra na poi,nepelrati tet,poilati dayasruke syasyaszi,neperlati di batunasa yang site menaye,metenena weimene. \v 23 Nepane we Kristus nenei neperlati Kristus Allah mino. \ No newline at end of file diff --git a/04/01.txt b/04/01.txt index ca6aefa..594eeaf 100644 --- a/04/01.txt +++ b/04/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 4 \v 1 Damane nepe, e detelro mete beimepekona, Kristus kna kembalri detelro, nepelre telrepelre telre enane kelraimepeko. Mang Walri nena euna A." \v 2 Nemane nepe, detelro telrepelre nete kelraimupukona eu pelrena a kalro nenei. eupelre kilriyai netenate detelro telrepelre te elrenaiye. -======= -\c 4 \v 1 Demane nepe,e detelro metebeimepekona,Kristus kna kembalri detelm nepelre telpelre te enane kraimepeko mang walri nei euna a. \v 2 Nemane nepe,Detelro telpere nete kraemepeko na Eu perna a kalro nenei Eupelre krinai netenate detalro telpelre te Elrnaiye. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\c 4 \v 1 Demane nepe,e detelro metebeimepekona,Kristus kna kembalri detelm nepelre telpelre te enane kraimepeko mang walri nei euna a. \v 2 Nemane nepe,Detelro telpere nete kraemepeko na Eu perna a kalro nenei Eupelre krinai netenate detalro telpelre te Elrnaiye. \ No newline at end of file diff --git a/04/03.txt b/04/03.txt index 856e5fa..9fb8f5c 100644 --- a/04/03.txt +++ b/04/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 De wembelre nemanemo, wakembai nelrone, endiki eine, nepelre kasopelre titeyaite. \v 4 A elralrena, nepelre A senamalrena yambu eina A ambai, wete telrepelretelre elrembe, nemane , hei nolrulre alru nepelre delre kalro. -======= -\v 3 Nemaneye,mebeinya a nelrone dowetembe bai ate tiyeina dia dewoembe.Nemanelati,delrei Eate asete tiyeikoipai. \v 4 Netenate,ne kalrone de telpelre elraipeko,netenate dena Tuhan ye,tiyekuko. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 3 Nemaneye,mebeinya a nelrone dowetembe bai ate tiyeina dia dewoembe.Nemanelati,delrei Eate asete tiyeikoipai. \v 4 Netenate,ne kalrone de telpelre elraipeko,netenate dena Tuhan ye,tiyekuko. \ No newline at end of file diff --git a/04/05.txt b/04/05.txt index 3892c67..ec71f67 100644 --- a/04/05.txt +++ b/04/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Netenate, wei telrepelre, detelro kena yambu na ambai, netena Mang Walri kena delre kalrone. -======= -\v 5 Netenate,Asetena depelrotena elripainya,nei yasrei mipai nyane,nepe Tuhan impainya yasrei,ne yansitete mendena metelrena sasyasi nekoeina nelraipekona,nenei kena einenate kia elrnaiye, neperna detelro mbei-mbei mang walri neete kafenemelre. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 5 Netenate,Asetena depelrotena elripainya,nei yasrei mipai nyane,nepe Tuhan impainya yasrei,ne yansitete mendena metelrena sasyasi nekoeina nelraipekona,nenei kena einenate kia elrnaiye, neperna detelro mbei-mbei mang walri neete kafenemelre. \ No newline at end of file diff --git a/04/06.txt b/04/06.txt index 7622e61..9f41d30 100644 --- a/04/06.txt +++ b/04/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 De yambu te senanemelre detelro yekote, nemna lati da yaselrei mewena yambu ambai, nepelre lati detelro delre-delre dayaselreite nepe peko te mekonemelre. \v 7 Nemane de Mang yambute bulrumeye senamalre yambu yatelrena, Mang Walri tiyekuko yansite tutena yate. -======= -\v 6 We esrete kekaupuko,da a kalrotena nepe derei eute bulrate elriyalre. nepelre Apolos wetante delvei eine dokanenenlre. netenate we kosatena Ambai da melraipenona ne netenate wena nelrone si nenei eutena kosatena dilrepainya. \v 7 Nemane sime wete buku yomu? beyasa wenane,denalre weyatipainya? nepelre nemeratena yatiyauna mena beyatena wena eute kasote elriyauwe,wei Eu yatipaina mane? ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 6 We esrete kekaupuko,da a kalrotena nepe derei eute bulrate elriyalre. nepelre Apolos wetante delvei eine dokanenenlre. netenate we kosatena Ambai da melraipenona ne netenate wena nelrone si nenei eutena kosatena dilrepainya. \v 7 Nemane sime wete buku yomu? beyasa wenane,denalre weyatipainya? nepelre nemeratena yatiyauna mena beyatena wena eute kasote elriyauwe,wei Eu yatipaina mane? \ No newline at end of file diff --git a/04/08.txt b/04/08.txt index 317d2a7..dc4b16b 100644 --- a/04/08.txt +++ b/04/08.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 8 Detelro delre-delre da yaselreitena nimeipai, nemane ne nepe nimeyaimbeko, nimeipaitena Yesus tena salibna bapipai. \v 9 Nemane lati, semona melraipukona: - " Dau eine itipaina sa, nepelre buntikei betepelre betopainya nepelre detelro yena kenane tuwaipainya, ne metelrena Mang Walri kelropuko detelro Mang Walrite kenabise eine" -======= -\v 8 Nepe eslre te mekapuko,we nepe syasasy kasopelre de ambainyane,we nepe ondoafi bulrane,dena kena wetena kroupekalre telpelre,tetke we ondoafi bulrane nitenat nembei tapemalre. \v 9 Netangte,dena mendona mangwalri etenepe elripuko,walri a keyana tutelrene tamupuko. detelro seteh samingduku tete nemane ete mekai melpeko sasoutena mane da yobailra doute taime poilati walri a keyana nemanelati detelroyei. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 8 Nepe eslre te mekapuko,we nepe syasasy kasopelre de ambainyane,we nepe ondoafi bulrane,dena kena wetena kroupekalre telpelre,tetke we ondoafi bulrane nitenat nembei tapemalre. \v 9 Netangte,dena mendona mangwalri etenepe elripuko,walri a keyana tutelrene tamupuko. detelro seteh samingduku tete nemane ete mekai melpeko sasoutena mane da yobailra doute taime poilati walri a keyana nemanelati detelroyei. \ No newline at end of file diff --git a/04/10.txt b/04/10.txt index bea0297..60ef858 100644 --- a/04/10.txt +++ b/04/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Nemane ye, Mang Walri da kalro etena Alru Walrolre saneyonu alru metelrena kalro keyatelre ne. nemane lati Mang Walri kena kote. \v 11 Nemane sate, detelro sime detelro kena nelrone metelrena saisasite nimeiyembuko, detelro kena alru eueine? nemane lati detelro sibetemena Mang Walri kena eine saisasi betepelre nimeipai nekalrotena nei Mang alrumbeimo. -======= -\v 10 E proprote kristus tante nemane lati ne mendoeute Kristus kena Eine.De wakembai we wake dopelrewe bene taimepeko depeko detelro. \v 11 Dasni tena de moning nepere bu malri mayong besiyai.me turuyaime nepelre yerau naina nikipai. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 10 E proprote kristus tante nemane lati ne mendoeute Kristus kena Eine.De wakembai we wake dopelrewe bene taimepeko depeko detelro. \v 11 Dasni tena de moning nepere bu malri mayong besiyai.me turuyaime nepelre yerau naina nikipai. \ No newline at end of file diff --git a/04/12.txt b/04/12.txt index 0e58fb0..04da7e3 100644 --- a/04/12.txt +++ b/04/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Da selreitena e yatiyandena da yobulrana alru ambai, nemena tena alru Mang kena netenate Mang Walri eteyatumuna kalrote nimeimalre. \v 13 Metelrena kalro ane elrandena ne a kalro detelro yambu kilripaina, nemena tena alru kilrinde metelrena saisasi walri kalrotena nepelre, walri atena. -======= -\v 12 De Euwake slande,derei meye nekande,nemane lati ete apako snaime. \v 13 Neperna apeko-peko snaine,ateme swanemelre nemanelati doselreite,e dayobulra kese mane,meki metelrena syazasi. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\v 12 De Euwake slande,derei meye nekande,nemane lati ete apako snaime. \v 13 Neperna apeko-peko snaine,ateme swanemelre nemanelati doselreite,e dayobulra kese mane,meki metelrena syazasi. \ No newline at end of file