diff --git a/08/28.txt b/08/28.txt index 0024bc3..592e047 100644 --- a/08/28.txt +++ b/08/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Panikerma, Ai ahaf foni afimipani,"eebm aani pani arof inim, pani pebm panimfete mahani kafnen naha pani ekemi, morgus pefenir mameh asotahamgutih pani naha asota amtoguruf pani mame atohompegebm niginar, morgus naha pani fani aandugaraf pani neneh Aihafor fani aandugati panimaraf teinduguruf. \v 29 Mosuk, ekemir amceis naha pani paifar wehanif naha, ekemipani naha tefenaf mumeh naha ahun panikerma nahapani haef fenefaandugaruf paniker mergue anahan yaan duguruf paniker ekemikafon. \v 30 Pogosaanok pani Ai ahaf fani atahamguti pahamen maefpani, iyeh pafi ekemikafon anahen amahami katnei. -======= -\v 28 Panikerma,Ai ahaf foni afimipani,"eebm aani pani arof inim,pani pebm panimfete mahani kafnen naha pani ekemi,morgus pefenir mameh asotahamgutih pani naha asota amtoguruf pani mame atohompegebm niginar,morgus naha pani fani aandugaraf pani neneh Aihafor fani aandugati panimaraf teinduguruf. \v 29 Mosuk,ekemir amceis naha pani paifar wehanif naha,ekemipani naha tefenaf mumeh naha ahun panikerma nahapani haef fenefaandugaruf paniker mergue anahan yaan duguruf paniker ekemikafon. \v 30 Pogosaanok pani Ai ahaf fani atahamguti pahamen maefpani,iyeh pafi ekemikafon anahen amahami katnei. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 28 Panikerma, Ai ahaf foni afimipani,"eebm aani pani arof inim, pani pebm panimfete mahani kafnen naha pani ekemi, morgus pefenir mameh asotahamgutih pani naha asota amtoguruf pani mame atohompegebm niginar, morgus naha pani fani aandugaraf pani neneh Aihafor fani aandugati panimaraf teinduguruf. \v 29 Mosuk, ekemir amceis naha pani paifar wehanif naha, ekemipani naha tefenaf mumeh naha ahun panikerma nahapani haef fenefaandugaruf paniker mergue anahan yaan duguruf paniker ekemikafon. \v 30 Pogosaanok pani Ai ahaf fani atahamguti pahamen maefpani, iyeh pafi ekemikafon anahen amahami katnei. \ No newline at end of file diff --git a/08/31.txt b/08/31.txt index f61a833..e8169b2 100644 --- a/08/31.txt +++ b/08/31.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 31 Pogobmsem, Ai ahaf fani amgomas Yahudi mafire kafon kifta ye kafon ekemenei pani eebm aanipani kyef nakom kafon yeisuk miahani katnen pani aanipani ifa ikarum haife ani nakonir. \v 32 Mosuk aani pani nanim fetemahani kateng haefpani, morgus haef pani aani kafon nah haefe kicahanten.Aani kafon. \v 33 Ekemi fonsaf amanastare ekemikefon, Nifi pani ABraham koma moftaf mosuk manikafon pasin tenimouftenen. Panikerma, nai aha fani aafiman, Aanipanina wahani katnen?" -======= -\v 31 Pogobmsem,Ai ahaf fani amgomas Yahudi mafire kafon kifta ye kafon ekemenei pani eebm aanipani kyef nakom kafon yeisuk miahani katnen pani aanipani ifa ikarum haife ani nakonir. \v 32 Mosuk aani pani nanim fetemahani kateng haefpani,morgus haef pani aani kafon nah haefe kicahanten.aani kafon. \v 33 Ekemi fonsaf amanastare ekemikefon,Nifi pani ABraham koma moftaf mosuk manikafon pasin tenimouftenen. panikerma,nai aha fani aafiman,Aanipanina wahani katnen?" ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 31 Pogobmsem, Ai ahaf fani amgomas Yahudi mafire kafon kifta ye kafon ekemenei pani eebm aanipani kyef nakom kafon yeisuk miahani katnen pani aanipani ifa ikarum haife ani nakonir. \v 32 Mosuk aani pani nanim fetemahani kateng haefpani, morgus haef pani aani kafon nah haefe kicahanten.Aani kafon. \v 33 Ekemi fonsaf amanastare ekemikefon, Nifi pani ABraham koma moftaf mosuk manikafon pasin tenimouftenen. Panikerma, nai aha fani aafiman, Aanipanina wahani katnen?" \ No newline at end of file diff --git a/08/34.txt b/08/34.txt index 1dc579b..5a1ddd7 100644 --- a/08/34.txt +++ b/08/34.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 34 Mosuk aani pani nanim fetemahani katenan haef pani, morgus haef pani aani kafon nah haefe kicahanten aani kafon. \v 35 inim ifuk nim pani forgus mimi maneh aha akes ani nifeni kafon karum mimame, morgus inim afef pani migumas karum. \v 36 Panikermo, tamkahane arof yabm kerotemguti aani kafon, aani ifa ikarum yabm korfo. -======= -\v 34 Mosuk aani pani nanim fetemahani katenan haef pani,morgus haef pani aani kafon nah haefe kicahanten aani kafon. \v 35 inim ifuk nim pani forgus mimi maneh aha akes ani nifeni kafon karum mimame,morgus inim afef pani migumas karum. \v 36 Panikermo,tamkahane arof yabm kerotemguti aani kafon,aani ifa ikarum yabm korfo. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 34 Mosuk aani pani nanim fetemahani katenan haef pani, morgus haef pani aani kafon nah haefe kicahanten aani kafon. \v 35 inim ifuk nim pani forgus mimi maneh aha akes ani nifeni kafon karum mimame, morgus inim afef pani migumas karum. \v 36 Panikermo, tamkahane arof yabm kerotemguti aani kafon, aani ifa ikarum yabm korfo. \ No newline at end of file diff --git a/08/37.txt b/08/37.txt index 8f5ad47..351ebc8 100644 --- a/08/37.txt +++ b/08/37.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 37 Nahar nanim pani aani pani Abraham kame meftaf, eebm aani pani ifah susuh finen nakefeme kyefnakompani sasafmame atohakom ekom. \v 38 Naha fani aafemefpam pegem kyef-kyef nar emar imofuk saaf aamefpani Ai nam pasin, pafogom kahane kabm aani amanaasen kyef-kyef aanir icara aamnaasen Aih ekomok. -======= -\v 37 Nahar nanim pani aani pani Abraham kame meftaf,eebm aani pani ifah susuh finen nakefeme kyefnakompani sasafmame atohakom ekom. \v 38 Naha fani aafemefpam pegem kyef-kyef nar emar imofuk saaf aamefpani Ai nam pasin,pafogom kahane kabm aani amanaasen kyef-kyef aanir icara aamnaasen Aih ekomok. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 37 Nahar nanim pani aani pani Abraham kame meftaf, eebm aani pani ifah susuh finen nakefeme kyefnakompani sasafmame atohakom ekom. \v 38 Naha fani aafemefpam pegem kyef-kyef nar emar imofuk saaf aamefpani Ai nam pasin, pafogom kahane kabm aani amanaasen kyef-kyef aanir icara aamnaasen Aih ekomok. \ No newline at end of file diff --git a/08/39.txt b/08/39.txt index e3af09a..916d514 100644 --- a/08/39.txt +++ b/08/39.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 39 Ekemenei feni ameenasmosuk fanenes ekemenei kafon,"Abraham pani AI nibmor Ai ahafor foni amgomas,"Ebm aani ABraham komo maftaf pani aani pani Abrahamer fahamguti pani aani anenam karyakabm. \v 40 Panikerma, aani pani naha suhanim, iye fanenespani anketipani kyaf haefpani, mosuk naha icaefsefpani Ai ahafkafonok, Abraham tenimame panikyefpani. \v 41 Mosuk,aani pani asoktapiraf pah nem eh Air asataandoguti pirahaf pigini pirahaf ekemi aham: ekemenei fani asendahanci ekemenaikafon."Nifi pani mapeem pemtakensuk asmeenof mame. nifi pani Aihofen yeisuk miahenef Ai ahafkefon. -======= -\v 39 Ekemenei feni ameenasmosuk fanenes ekemenei kafon,"Abraham pani AI nibmor Ai ahafor foni amgomas,"Ebm aani ABraham komo maftaf pani aani pani Abrahamer fahamguti pani aani anenam karyakabm. \v 40 Panikerma,aani pani naha suhanim,iye fanenespani anketipani kyaf haefpani,mosuk naha icaefsefpani Ai ahafkafonok,Abraham tenimame panikyefpani. \v 41 Mosuk,aani pani asoktapiraf pah nem eh Air asataandoguti pirahaf pigini pirahaf ekemi aham: ekemenei fani asendahanci ekemenaikafon."Nifi pani mapeem pemtakensuk asmeenof mame. nifi pani Aihofen yeisuk miahenef Ai ahafkefon. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 39 Ekemenei feni ameenasmosuk fanenes ekemenei kafon,"Abraham pani AI nibmor Ai ahafor foni amgomas,"Ebm aani ABraham komo maftaf pani aani pani Abrahamer fahamguti pani aani anenam karyakabm. \v 40 Panikerma, aani pani naha suhanim, iye fanenespani anketipani kyaf haefpani, mosuk naha icaefsefpani Ai ahafkafonok, Abraham tenimame panikyefpani. \v 41 Mosuk,aani pani asoktapiraf pah nem eh Air asataandoguti pirahaf pigini pirahaf ekemi aham: ekemenei fani asendahanci ekemenaikafon."Nifi pani mapeem pemtakensuk asmeenof mame. nifi pani Aihofen yeisuk miahenef Ai ahafkefon. \ No newline at end of file diff --git a/08/42.txt b/08/42.txt index ad290bc..c55c3f8 100644 --- a/08/42.txt +++ b/08/42.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 42 Ai ahafar feni amgomas ekemeneikafon,"Mosuk Aih pani AI ahaf kamer, Aani pani na akefe onahan amnaam naha pani Ai ahafkan pebm hosefsef. Mosuk, naha pani anefpani nigina komo finen enak anef mame, mosuk ekemir, fas maraf naha. \v 43 Naih aani nar tenduguruf pani nanimfetenafmen teindagutenen naarfoni aan dugurufpani. \v 44 Aani pani Ai ekomok hasefesenen, pani hahuf pasin aani pani igimaani koma finenok amnaasen mosuk Aih egom komofinenok amnasen ekemi paninag, susuh kokooh tenem emur ofuk mosuk yeif mameh kyeh haefpani pebm pani otohokam nimpani finenhaef aanefmame morgus ekemi pani fani aafemi pani oraaf, ekemi fani aafemi pani arafmo arof aih. -======= -\v 42 Ai ahafar feni amgomas ekemeneikafon,"Mosuk Aih pani AI ahaf kamer,Aani pani na akefe onahan amnaam naha pani Ai ahafkan pebm hosefsef.Mosuk,naha pani anefpani nigina komo finen enak anef mame,mosuk ekemir,fas maraf naha. \v 43 Naih aani nar tenduguruf pani nanimfetenafmen teindagutenen naarfoni aan dugurufpani. \v 44 Aani pani Ai ekomok hasefesenen,pani hahuf pasin aani pani igimaani koma finenok amnaasen mosuk Aih egom komofinenok amnasen ekemi paninag,susuh kokooh tenem emur ofuk mosuk yeif mameh kyeh haefpani pebm pani otohokam nimpani finenhaef aanefmame morgus ekemi pani fani aafemi pani oraaf,ekemi fani aafemi pani arafmo arof aih. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 42 Ai ahafar feni amgomas ekemeneikafon,"Mosuk Aih pani AI ahaf kamer, Aani pani na akefe onahan amnaam naha pani Ai ahafkan pebm hosefsef. Mosuk, naha pani anefpani nigina komo finen enak anef mame, mosuk ekemir, fas maraf naha. \v 43 Naih aani nar tenduguruf pani nanimfetenafmen teindagutenen naarfoni aan dugurufpani. \v 44 Aani pani Ai ekomok hasefesenen, pani hahuf pasin aani pani igimaani koma finenok amnaasen mosuk Aih egom komofinenok amnasen ekemi paninag, susuh kokooh tenem emur ofuk mosuk yeif mameh kyeh haefpani pebm pani otohokam nimpani finenhaef aanefmame morgus ekemi pani fani aafemi pani oraaf, ekemi fani aafemi pani arafmo arof aih. \ No newline at end of file diff --git a/08/48.txt b/08/48.txt index cbc42f7..7f32adb 100644 --- a/08/48.txt +++ b/08/48.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 48 Yahudi mafire-mafire fani amonas Ai ahaf mosuk foni amanas ekemnei kafon, Ikarum mame aebm nifi pani fani amahani kabm pani aha paninah Samaria nim mosuk aahapani hahur yefami atohokam? \v 49 Ai ahaf faniamgomas,'Naha kahur yef mameh, ebm naha pani Aih nakom finen haeftahaf, ebm aani naha finen haef tenimame. -======= -\v 48 Yahudi mafire-mafire fani amonas Ai ahaf mosuk foni amanas ekemnei kafon,Ikarum mame aebm nifi pani fani amahani kabm pani aha paninah Samaria nim mosuk aahapani hahur yefami atohokam? \v 49 Ai ahaf faniamgomas,'Naha kahur yef mameh,ebm naha pani Aih nakom finen haeftahaf,ebm aani naha finen haef tenimame. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 48 Yahudi mafire-mafire fani amonas Ai ahaf mosuk foni amanas ekemnei kafon, Ikarum mame aebm nifi pani fani amahani kabm pani aha paninah Samaria nim mosuk aahapani hahur yefami atohokam? \v 49 Ai ahaf faniamgomas,'Naha kahur yef mameh, ebm naha pani Aih nakom finen haeftahaf, ebm aani naha finen haef tenimame. \ No newline at end of file diff --git a/08/50.txt b/08/50.txt index e90bb9e..7f2dd86 100644 --- a/08/50.txt +++ b/08/50.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 50 Panikerma, nahapani niginaah kerma otohom yaarah pirahaf fetenef mameh;pirahaf pani peftahami morgus pieh ekemir kokofokitisuktahami. \v 51 Morgus ifa ikarum, nahafono aafemafpan aakefe, pahamen iyeh pani ekemi komo kyef maraf tahamguti pani, ekemi komo legef maraf tahamgutipani, ekemi pani kanigin otomof panisafkef mame. -======= -\v 50 Panikerma,nahapani niginaah kerma otohom yaarah pirahaf fetenef mameh;pirahaf pani peftahami morgus pieh ekemir kokofokitisuktahami. \v 51 Morgus ifa ikarum,nahafono aafemafpan aakefe,pahamen iyeh pani ekemi komo kyef maraf tahamguti pani,ekemi komo legef maraf tahamgutipani,ekemi pani kanigin otomof panisafkef mame. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 50 Panikerma, nahapani niginaah kerma otohom yaarah pirahaf fetenef mameh;pirahaf pani peftahami morgus pieh ekemir kokofokitisuktahami. \v 51 Morgus ifa ikarum, nahafono aafemafpan aakefe, pahamen iyeh pani ekemi komo kyef maraf tahamguti pani, ekemi komo legef maraf tahamgutipani, ekemi pani kanigin otomof panisafkef mame. \ No newline at end of file diff --git a/08/52.txt b/08/52.txt index 3be58d2..b553c48 100644 --- a/08/52.txt +++ b/08/52.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 52 Yahudi mafire pani Ai ahaf kefon fonsaafamnaastare,"Pogosaanok nifi nanim pani ahapani hahuryekami! Morgus, Abraham pasin ifuk nim pirahaf pasin pani kanigin fani, MOrgus, aha fani amahan,"Pirahaf nim pani mahai aha pani Ai ahafkana kyef maraf wahamguti pani kanigin saaf kefmami. \v 53 Tamkahane aha ifahamen afnam Abraham pani hamen mame afnaam Ainibm, pani kanifus? mosuk ifuk yeh pasin kanigin atanas; mahai pasin aha parugus asmahani gir amnuamum? -======= -\v 52 Yahudi mafire pani Ai ahaf kefon fonsaafamnaastare,"Pogosaanok nifi nanim pani ahapani hahuryekami! Morgus,Abraham pasin ifuk nim pirahaf pasin pani kanigin fani,MOrgus,aha fani amahan,"Pirahaf nim pani mahai aha pani Ai ahafkana kyef maraf wahamguti pani kanigin saaf kefmami. \v 53 Tamkahane aha ifahamen afnam Abraham pani hamen mame afnaam Ainibm,pani kanifus? mosuk ifuk yeh pasin kanigin atanas;mahai pasin aha parugus asmahani gir amnuamum? ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 52 Yahudi mafire pani Ai ahaf kefon fonsaafamnaastare,"Pogosaanok nifi nanim pani ahapani hahuryekami! Morgus, Abraham pasin ifuk nim pirahaf pasin pani kanigin fani, MOrgus, aha fani amahan,"Pirahaf nim pani mahai aha pani Ai ahafkana kyef maraf wahamguti pani kanigin saaf kefmami. \v 53 Tamkahane aha ifahamen afnam Abraham pani hamen mame afnaam Ainibm, pani kanifus? mosuk ifuk yeh pasin kanigin atanas; mahai pasin aha parugus asmahani gir amnuamum? \ No newline at end of file diff --git a/08/54.txt b/08/54.txt index 11b6efb..3e3bc24 100644 --- a/08/54.txt +++ b/08/54.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 54 Ai ahafor aah kamofos, eebm naha niginakome otoham pirahaf yaaremgubmpeni nigina koma otoham pani leyef afinimkef mameh; Aih namor yaaremguti naakefe, mosuk neneh aanir foniamanaanen, ekemi pani Aih nibmor. \v 55 Morgus,aani pani nanimfetengmame ekemi pani cebm naha nani ikemi, mosuk naha foni amahaf naha fani anedufpani naha nanim mame ekemi pasin ekoni komo kyefmaref. \v 56 Ai anam, Abraham, anaham tahamguti pani tamenim sooguti paniker. Ekemi soogutipani kertahamguti fete ahakanpani. -======= -\v 54 Ai ahafor aah kamofos,eebm naha niginakome otoham pirahaf yaaremgubmpeni nigina koma otoham pani leyef afinimkef mameh;Aih namor yaaremguti naakefe,mosuk neneh aanir foniamanaanen,ekemi pani Aih nibmor. \v 55 Morgus,aani pani nanimfetengmame ekemi pani cebm naha nani ikemi,mosuk naha foni amahaf naha fani anedufpani naha nanim mame ekemi pasin ekoni komo kyefmaref. \v 56 Ai anam,Abraham,anaham tahamguti pani tamenim sooguti paniker. ekemi soogutipani kertahamguti fete ahakanpani. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 54 Ai ahafor aah kamofos, eebm naha niginakome otoham pirahaf yaaremgubmpeni nigina koma otoham pani leyef afinimkef mameh; Aih namor yaaremguti naakefe, mosuk neneh aanir foniamanaanen, ekemi pani Aih nibmor. \v 55 Morgus,aani pani nanimfetengmame ekemi pani cebm naha nani ikemi, mosuk naha foni amahaf naha fani anedufpani naha nanim mame ekemi pasin ekoni komo kyefmaref. \v 56 Ai anam, Abraham, anaham tahamguti pani tamenim sooguti paniker. Ekemi soogutipani kertahamguti fete ahakanpani. \ No newline at end of file diff --git a/08/57.txt b/08/57.txt index 0520c62..6449dee 100644 --- a/08/57.txt +++ b/08/57.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 57 Morgus, Yahudi mafire pani tani amahanafere ataham anum pani nah figifas mame yaasik 50 Tahun, eebm aani pani Abraham saafamahanen? \v 58 Ai ahaf fansuk amgomas ekemeneikefan, ifa ikarum naha foni amahaif aanikafon, ifuk Abraham mimimentafpani naha pani mihaf. \v 59 Panikermo, ekemenei pani bata memkamsuk yawih yaa amahanigir ammanas ekemi kafon, morgus Ai ahaf pani kemyefos otohom nimpani morgus tamsefos kyef fani kasin wauh nimpani. -======= -\v 57 Morgus,Yahudi mafire pani tani amahanafere ataham anum pani nah figifas mame yaasik 50 Tahun,eebm aani pani Abraham saafamahanen? \v 58 Ai ahaf fansuk amgomas ekemeneikefan,ifa ikarum naha foni amahaif aanikafon,ifuk Abraham mimimentafpani naha pani mihaf. \v 59 Panikermo,ekemenei pani bata memkamsuk yawih yaa amahanigir ammanas ekemi kafon,morgus Ai ahaf pani kemyefos otohom nimpani morgus tamsefos kyef fani kasin wauh nimpani. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 57 Morgus, Yahudi mafire pani tani amahanafere ataham anum pani nah figifas mame yaasik 50 Tahun, eebm aani pani Abraham saafamahanen? \v 58 Ai ahaf fansuk amgomas ekemeneikefan, ifa ikarum naha foni amahaif aanikafon, ifuk Abraham mimimentafpani naha pani mihaf. \v 59 Panikermo, ekemenei pani bata memkamsuk yawih yaa amahanigir ammanas ekemi kafon, morgus Ai ahaf pani kemyefos otohom nimpani morgus tamsefos kyef fani kasin wauh nimpani. \ No newline at end of file diff --git a/09/01.txt b/09/01.txt index 27b4dfb..29e33b8 100644 --- a/09/01.txt +++ b/09/01.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD \c 9 \s Nimi Pirhav Saam Mentav Kapehkamuk Hoasevus -\p \v 1 Pem Tabnyeim avi wagomas, pem avi saabus pirhav nim saam tenaharuf oukasin tenan inyou koma kapeh kamuk hoasevus kavun. \v 2 Kavus-kavus Tabnyeimkanir fonsahanes ekemi kavun, "Guru, matir isohoiv yavahami,pegem nim nanim ainim pani paniker pieh umumfani pieh onim? -======= -\c 9 (Nimi Pirhav Saam Mentav Kapehkamuk Hoasevus) \v 1 Pem Tabnyeim avi wagomas,pem avi saabus pirhav nim saam tenaharuf oukasin tenan inyou koma kapeh kamuk hoasevus kavun. \v 2 Kavus-kavus Tabnyeimkanir fonsahanes ekemi kavun, "Guru,matir isohoiv yavahami,pegem nim nanim ainim pani paniker pieh umumfani pieh onim? ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\p \v 1 Pem Tabnyeim avi wagomas, pem avi saabus pirhav nim saam tenaharuf oukasin tenan inyou koma kapeh kamuk hoasevus kavun. \v 2 Kavus-kavus Tabnyeimkanir fonsahanes ekemi kavun, "Guru, matir isohoiv yavahami,pegem nim nanim ainim pani paniker pieh umumfani pieh onim? \ No newline at end of file diff --git a/09/03.txt b/09/03.txt index e012046..977d866 100644 --- a/09/03.txt +++ b/09/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Tabnyeim avi vas, pegemur mame mosuk pani ainimur mame, paniker pani karia-karia Allah ekemir saas maraf ekemi. \v 4 Nivi pani Amhangir kari-kariacicik niveni ekemir voni amgomas ngarov empani tame ivitpani;isih pich hohuti pani arove yomse karia tenimentav pem. \v 5 Em pani naha mihamgum pegem hucaam, pani komo karia. -======= -\v 3 Tabnyeim avi vas,pegemur mame mosuk pani ainimur mame,paniker pani karia-karia Allah ekemir saas maraf ekemi. \v 4 Nivi pani Amhangir kari-kariacicik niveni ekemir voni amgomas ngarov empani tame ivitpani;isih pich hohuti pani arove yomse karia tenimentav pem. \v 5 Em pani naha mihamgum pegem hucaam,pani komo karia. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 3 Tabnyeim avi vas, pegemur mame mosuk pani ainimur mame, paniker pani karia-karia Allah ekemir saas maraf ekemi. \v 4 Nivi pani Amhangir kari-kariacicik niveni ekemir voni amgomas ngarov empani tame ivitpani;isih pich hohuti pani arove yomse karia tenimentav pem. \v 5 Em pani naha mihamgum pegem hucaam, pani komo karia. \ No newline at end of file diff --git a/09/08.txt b/09/08.txt index 4c3bdba..c162dc1 100644 --- a/09/08.txt +++ b/09/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Pogoni karev onove yemseh karev kani pegenir saaf men ekemikavun saafmentav saamen nim pogomur avi fas, pegemur avnam otomov marav migansuk keyi fomitogomas? \v 9 Peveni mavire voniamnas ya pavgemur voni emtogomas pevenir venenes mame pani pogom nim kahane piginir vagamas pem semsuk mas pogom saam mentav avi vas, naav keyi fontogomas pani. -======= -\v 8 Pogoni karev onove yemseh karev kani pegenir saaf men ekemikavun saafmentav saamen nim pogomur avi fas,pegemur avnam otomov marav migansuk keyi fomitogomas? \v 9 Peveni mavire voniamnas ya pavgemur voni emtogomas pevenir venenes mame pani pogom nim kahane piginir vagamas pem semsuk mas pogom saam mentav avi vas,naav keyi fontogomas pani. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 8 Pogoni karev onove yemseh karev kani pegenir saaf men ekemikavun saafmentav saamen nim pogomur avi fas, pegemur avnam otomov marav migansuk keyi fomitogomas? \v 9 Peveni mavire voniamnas ya pavgemur voni emtogomas pevenir venenes mame pani pogom nim kahane piginir vagamas pem semsuk mas pogom saam mentav avi vas, naav keyi fontogomas pani. \ No newline at end of file diff --git a/09/10.txt b/09/10.txt index 9376c45..c81db09 100644 --- a/09/10.txt +++ b/09/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Pem onove yemseh pem avi vanenes kavun,"Tamkahane saam anum pieh pesevvani? \v 11 Pogom nim avi vas, pogom nim Tabnyeim pani parivir amgomas ukem mosuk avi yapanivir amgomas saamnim avi runuruv amgomas saamnimpen semsuk, ekemi avi vas soum pogoi Siloam mosuk nah mumeit otohoim anum,paniker naha sogum na memetigin otohum nam, mosuk naha ovi saav veev. \v 12 Pegemir avi vanenes ekemnikavun, tamhanir pigini nim? ekemi avi vair naha nanim mame," -======= -\v 10 Pem onove yemseh pem avi vanenes kavun,"Tamkahane saam anum pieh pesevvani? \v 11 Pogom nim avi vas,pogom nim Tabnyeim pani parivir amgomas ukem mosuk avi yapanivir amgomas saamnim avi runuruv amgomas saamnimpen semsuk,ekemi avi vas soum pogoi Siloam mosuk nah mumeit otohoim anum,paniker naha sogum na memetigin otohum nam,mosuk naha ovi saav veev. \v 12 Pegemir avi vanenes ekemnikavun,tamhanir pigini nim? ekemi avi vair naha nanim mame," ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 10 Pem onove yemseh pem avi vanenes kavun,"Tamkahane saam anum pieh pesevvani? \v 11 Pogom nim avi vas, pogom nim Tabnyeim pani parivir amgomas ukem mosuk avi yapanivir amgomas saamnim avi runuruv amgomas saamnimpen semsuk, ekemi avi vas soum pogoi Siloam mosuk nah mumeit otohoim anum,paniker naha sogum na memetigin otohum nam, mosuk naha ovi saav veev. \v 12 Pegemir avi vanenes ekemnikavun, tamhanir pigini nim? ekemi avi vair naha nanim mame," \ No newline at end of file diff --git a/09/13.txt b/09/13.txt index 50feb3a..0b759e3 100644 --- a/09/13.txt +++ b/09/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Pemsemsuk, ekemni avi yosevnes pogomnim saam mentav migomas pani ekemni kavun parisih mavirekavun. \v 14 Pemsemsuk peim tame pani Tabnyeim avi yaparvir amgomat ukem mosok avi pevevas saam pagomnim pani tame ibahaiv. \v 15 Paniker,pieh Farisi mavire pieh fonsav amnas tereh tamkahane pigininim saam pesev vami, ekemni avi fas ekemni kavun, ekemi yapari firamhami ukempam, mosuk avi ruvruv vami saam nampegev pem avi saav veev. -======= -\v 13 Pemsemsuk,ekemni avi yosevnes pogomnim saam mentav migomas pani ekemni kavun parisih mavirekavun. \v 14 Pemsemsuk peim tame pani Tabnyeim avi yaparvir amgomat ukem mosok avi pevevas saam pagomnim pani tame ibahaiv. \v 15 Paniker,pieh Farisi mavire pieh fonsav amnas tereh tamkahane pigininim saam pesev vami,ekemni avi fas ekemni kavun,ekemi yapari firamhami ukempam,mosuk avi ruvruv vami saam nampegev pem avi saav veev. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 13 Pemsemsuk, ekemni avi yosevnes pogomnim saam mentav migomas pani ekemni kavun parisih mavirekavun. \v 14 Pemsemsuk peim tame pani Tabnyeim avi yaparvir amgomat ukem mosok avi pevevas saam pagomnim pani tame ibahaiv. \v 15 Paniker,pieh Farisi mavire pieh fonsav amnas tereh tamkahane pigininim saam pesev vami, ekemni avi fas ekemni kavun, ekemi yapari firamhami ukempam, mosuk avi ruvruv vami saam nampegev pem avi saav veev. \ No newline at end of file