From ca6d4dc16a9e1dae470ea2ed0cff69186b407d72 Mon Sep 17 00:00:00 2001 From: "bahasatech.indotimur" Date: Fri, 5 Apr 2024 11:44:46 +0900 Subject: [PATCH] Fri Apr 05 2024 11:44:45 GMT+0900 (Japan Standard Time) --- 10/14.txt | 6 +----- 10/17.txt | 6 +----- 10/19.txt | 6 +----- 10/22.txt | 7 +------ 10/25.txt | 6 +----- 10/27.txt | 6 +----- 10/29.txt | 6 +----- 10/32.txt | 6 +----- 12/09.txt | 6 +----- 21/24.txt | 6 +----- 10 files changed, 10 insertions(+), 51 deletions(-) diff --git a/10/14.txt b/10/14.txt index fe55a29..8ee11ae 100644 --- a/10/14.txt +++ b/10/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Tavrogom ekemi nim pani naar.pegeni tavrogom pav nigina vinen eit miahav. Tavrogom nagani vasin nigana kavon yuhum eit miahane. \v 15 Kahane kabm Ai ahavor naakev nanim, na vasin ai ahav, kavon nanim mosok igina vasin tavrogom nageni kievok tagansuk avi kanivgubm kabm. \v 16 Na vasin tavrogom peveni ye miahani pegeni tavrogom vasin mimi mame ekemni vasin tuvyeivatgaansuk yavhuhur keir, mosok ekemni vasin mouv nam kabm nanyahanir keir, mosok ekemni vasin ase pirahav asmegiti pebm tavrogom yambi nim vasin pirahav kabm asmier keir. -======= -\v 14 Tavrogom ekemi nim pani naar.pegeni tavrogom pav nigina vinen eit miahav.tavrogom nagani vasin nigana kavon yuhum eit miahane. \v 15 Kahane kabm Ai ahavor naakev nanim,na vasin ai ahav,kavon nanim mosok igina vasin tavrogom nageni kievok tagansuk avi kanivgubm kabm. \v 16 Na vasin tavrogom peveni ye miahani pegeni tavrogom vasin mimi mame ekemni vasin tuvyeivatgaansuk yavhuhur keir,mosok ekemni vasin mouv nam kabm nanyahanir keir,mosok ekemni vasin ase pirahav asmegiti pebm tavrogom yambi nim vasin pirahav kabm asmier keir. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 14 Tavrogom ekemi nim pani naar.pegeni tavrogom pav nigina vinen eit miahav. Tavrogom nagani vasin nigana kavon yuhum eit miahane. \v 15 Kahane kabm Ai ahavor naakev nanim, na vasin ai ahav, kavon nanim mosok igina vasin tavrogom nageni kievok tagansuk avi kanivgubm kabm. \v 16 Na vasin tavrogom peveni ye miahani pegeni tavrogom vasin mimi mame ekemni vasin tuvyeivatgaansuk yavhuhur keir, mosok ekemni vasin mouv nam kabm nanyahanir keir, mosok ekemni vasin ase pirahav asmegiti pebm tavrogom yambi nim vasin pirahav kabm asmier keir. \ No newline at end of file diff --git a/10/17.txt b/10/17.txt index 65e06b6..bfdcebc 100644 --- a/10/17.txt +++ b/10/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Nniginaa gomo tavrogom kivok kanivsuk pie henavgur avsuk tahav mosok aiahavor pigini sesuk nakev marhaev tahami, nakev. \v 18 Nim pirahavor semsuk pa ponaitik nakev sumguti mosok kangin kiev mame. niginaar semsuk kanvgubm avgubm mosuk suahani katni. nar kanivgubm avgubm pani kanivgubm. Ebm niginaar vorogur avgubm vorogubm. Ai ahavor nakev vas kiev pegemahanir -======= -\v 17 Nniginaa gomo tavrogom kivok kanivsuk pie henavgur avsuk tahav mosok aiahavor pigini sesuk nakev marhaev tahami,nakev. \v 18 Nim pirahavor semsuk pa ponaitik nakev sumguti mosok kangin kiev mame. niginaar semsuk kanvgubm avgubm mosuk suahani katni. nar kanivgubm avgubm pani kanivgubm.ebm niginaar vorogur avgubm vorogubm. ai ahavor nakev vas kiev pegemahanir ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 17 Nniginaa gomo tavrogom kivok kanivsuk pie henavgur avsuk tahav mosok aiahavor pigini sesuk nakev marhaev tahami, nakev. \v 18 Nim pirahavor semsuk pa ponaitik nakev sumguti mosok kangin kiev mame. niginaar semsuk kanvgubm avgubm mosuk suahani katni. nar kanivgubm avgubm pani kanivgubm. Ebm niginaar vorogur avgubm vorogubm. Ai ahavor nakev vas kiev pegemahanir \ No newline at end of file diff --git a/10/19.txt b/10/19.txt index df26943..4aa06a3 100644 --- a/10/19.txt +++ b/10/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 Pogom kahane kiev avnas mosok Yahudi yer nanyesuk pie kiev crobm pie asmeis Yesus gomo kiev pebm. \v 20 Mavrie pavir semsuk ekemi kavon yavon temnaas, pegemnim pam hahor yevami mosok tahami avon temnaas mosok yetu asneenovami. Ani nai pegem nim gomo kiev nanyav avaanen? \v 21 Peveni yer semsuk, hahar yev anvatmos ye pav ekemir avi kiev kahane avon vatmos. Hahor yev ye pani saam tenem ye pav asusu muv tenem avon temnaas. -======= -\v 19 Pogom kahane kiev avnas mosok Yahudi yer nanyesuk pie kiev crobm pie asmeis Yesus gomo kiev pebm. \v 20 Mavrie pavir semsuk ekemi kavon yavon temnaas,pegemnim pam hahor yevami mosok tahami avon temnaas mosok yetu asneenovami.Ani nai pegem nim gomo kiev nanyav avaanen? \v 21 Peveni yer semsuk,hahar yev anvatmos ye pav ekemir avi kiev kahane avon vatmos. hahor yev ye pani saam tenem ye pav asusu muv tenem avon temnaas. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 19 Pogom kahane kiev avnas mosok Yahudi yer nanyesuk pie kiev crobm pie asmeis Yesus gomo kiev pebm. \v 20 Mavrie pavir semsuk ekemi kavon yavon temnaas, pegemnim pam hahor yevami mosok tahami avon temnaas mosok yetu asneenovami. Ani nai pegem nim gomo kiev nanyav avaanen? \v 21 Peveni yer semsuk, hahar yev anvatmos ye pav ekemir avi kiev kahane avon vatmos. Hahor yev ye pani saam tenem ye pav asusu muv tenem avon temnaas. \ No newline at end of file diff --git a/10/22.txt b/10/22.txt index f6abdb5..f367b28 100644 --- a/10/22.txt +++ b/10/22.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -Arov Vasin, it Vasin Pirav -\p \v 22 Pogom tame pani,utur tame penahbisan Yerusalem pogov mutuvnes. Pogom tame pani omov niv tame. \v 23 Aiahav gomo wou hum marav wou Salomogomo wou horeiv avon vatmos. Yesusur pogov marav wagomas mosok. \v 24 Mosok Yahudi yer ekemi kavon ho eitgisik kiev yavnaas ekemi ahav kavon, tame tam kahane abm aar nivi kavon en kitsuk wagomasin pani tenem? ebm aha Kristus, avkoton pani saam esgis vim nivi kavon. -======= -(Arov Vasin,it Vasin Pirav) \v 22 Pogom tame pani,utur tame penahbisan Yerusalem pogov mutuvnes. pogom tame pani omov niv tame. \v 23 Aiahav gomo wou hum marav wou Salomogomo wou horeiv avon vatmos. Yesusur pogov marav wagomas mosok. \v 24 Mosok Yahudi yer ekemi kavon ho eitgisik kiev yavnaas ekemi ahav kavon,tame tam kahane abm aar nivi kavon en kitsuk wagomasin pani tenem? ebm aha Kristus,avkoton pani saam esgis vim nivi kavon. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +(Arov Vasin,it Vasin Pirav) \v 22 Pogom tame pani,utur tame penahbisan Yerusalem pogov mutuvnes. pogom tame pani omov niv tame. \v 23 Aiahav gomo wou hum marav wou Salomogomo wou horeiv avon vatmos. Yesusur pogov marav wagomas mosok. \v 24 Mosok Yahudi yer ekemi kavon ho eitgisik kiev yavnaas ekemi ahav kavon,tame tam kahane abm aar nivi kavon en kitsuk wagomasin pani tenem? ebm aha Kristus,avkoton pani saam esgis vim nivi kavon. \ No newline at end of file diff --git a/10/25.txt b/10/25.txt index bbac583..0e11456 100644 --- a/10/25.txt +++ b/10/25.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 25 Yesus ekemni kavon avi vas, naha kiev emar imovok kayer ankiev, ebm ani nanyav mame. Naar ankiev meimeenov avatov karia-karia pav ai ahav namgomo vinen marav tahav, kiev-kiev vasin pigini marav nigina gomo otohom pam. \v 26 Mosok ebm, ani nanyav mame, panig ani tavrogom nagenir mame. -======= -\v 25 Yesus ekemni kavon avi vas,naha kiev emar imovok kayer ankiev,ebm ani nanyav mame.naar ankiev meimeenov avatov karia-karia pav ai ahav namgomo vinen marav tahav,kiev-kiev vasin pigini marav nigina gomo otohom pam. \v 26 Mosok ebm,ani nanyav mame,panig ani tavrogom nagenir mame. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 25 Yesus ekemni kavon avi vas, naha kiev emar imovok kayer ankiev, ebm ani nanyav mame. Naar ankiev meimeenov avatov karia-karia pav ai ahav namgomo vinen marav tahav, kiev-kiev vasin pigini marav nigina gomo otohom pam. \v 26 Mosok ebm, ani nanyav mame, panig ani tavrogom nagenir mame. \ No newline at end of file diff --git a/10/27.txt b/10/27.txt index ee91519..9004f14 100644 --- a/10/27.txt +++ b/10/27.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 27 Tavrogom namor avnangir sahanik pani mouv nam nanyahangisahanir, naha ekemni kavon nanim mosok ekemni vasin naa marav reimhuhungisahanik. \v 28 Naar kangin mentav miyo enov amahav mosok pegenir pevkiev mame; mosok pegenir pie kanivgur avsuk teni mame, ebm tagem nimor kemoguti yabm namok. -======= -\v 27 Tavrogom namor avnangir sahanik pani mouv nam nanyahangisahanir,naha ekemni kavon nanim mosok ekemni vasin naa marav reimhuhungisahanik. \v 28 Naar kangin mentav miyo enov amahav mosok pegenir pevkiev mame; mosok pegenir pie kanivgur avsuk teni mame,ebm tagem nimor kemoguti yabm namok. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 27 Tavrogom namor avnangir sahanik pani mouv nam nanyahangisahanir, naha ekemni kavon nanim mosok ekemni vasin naa marav reimhuhungisahanik. \v 28 Naar kangin mentav miyo enov amahav mosok pegenir pevkiev mame; mosok pegenir pie kanivgur avsuk teni mame, ebm tagem nimor kemoguti yabm namok. \ No newline at end of file diff --git a/10/29.txt b/10/29.txt index 9978af5..4c93581 100644 --- a/10/29.txt +++ b/10/29.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 29 Aiahavor eis pegeni ye pav naakavon ekemir hamen maev peveni pav pahamen yanis, mosok peveni yer semsok yabm namok kenaav muv tenem. Ai ahav gomo yabmuk. \v 30 Naavasin Ai vasin pirahav. \v 31 Yahudi ye pogobm yakaav afgansuk Yesus kavon yawi yamahangir avsuk amnaas. -======= -\v 29 Aiahavor eis pegeni ye pav naakavon ekemir hamen maev peveni pav pahamen yanis,mosok peveni yer semsok yabm namok kenaav muv tenem. ai ahav gomo yabmuk. \v 30 Naavasin Ai vasin pirahav. \v 31 Yahudi ye pogobm yakaav afgansuk Yesus kavon yawi yamahangir avsuk amnaas. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 29 Aiahavor eis pegeni ye pav naakavon ekemir hamen maev peveni pav pahamen yanis, mosok peveni yer semsok yabm namok kenaav muv tenem. Ai ahav gomo yabmuk. \v 30 Naavasin Ai vasin pirahav. \v 31 Yahudi ye pogobm yakaav afgansuk Yesus kavon yawi yamahangir avsuk amnaas. \ No newline at end of file diff --git a/10/32.txt b/10/32.txt index ffbbb63..02f97d3 100644 --- a/10/32.txt +++ b/10/32.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 32 Yesus semsuk ekemni kavon vas, Ai ahavor nakev kana haev eis pigini marav teintogomev aves mosuk teintogomev. Haev eis pigini marav teintogomev aves mosuk teintogomev. Tagem karia pigini sesuk husier asnenov amahanen anyoh aves. \v 33 Yahudi ye vasin karia haev anom pigini sesuk akev yaka yawi asahangir amahane. Piginioh aar apahav kiev ai ahav kavon voni amahamon pigini keir, i yer semsok aiahav kahane miahav, avni muv tenem avon temnaas. -======= -\v 32 Yesus semsuk ekemni kavon vas,Ai ahavor nakev kana haev eis pigini marav teintogomev aves mosuk teintogomev. haev eis pigini marav teintogomev aves mosuk teintogomev. tagem karia pigini sesuk husier asnenov amahanen anyoh aves. \v 33 Yahudi ye vasin karia haev anom pigini sesuk akev yaka yawi asahangir amahane. piginioh aar apahav kiev ai ahav kavon voni amahamon pigini keir,i yer semsok aiahav kahane miahav,avni muv tenem avon temnaas. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 32 Yesus semsuk ekemni kavon vas, Ai ahavor nakev kana haev eis pigini marav teintogomev aves mosuk teintogomev. Haev eis pigini marav teintogomev aves mosuk teintogomev. Tagem karia pigini sesuk husier asnenov amahanen anyoh aves. \v 33 Yahudi ye vasin karia haev anom pigini sesuk akev yaka yawi asahangir amahane. Piginioh aar apahav kiev ai ahav kavon voni amahamon pigini keir, i yer semsok aiahav kahane miahav, avni muv tenem avon temnaas. \ No newline at end of file diff --git a/12/09.txt b/12/09.txt index d6ada46..148b0d8 100644 --- a/12/09.txt +++ b/12/09.txt @@ -1,7 +1,3 @@ \v 9 Pami ker, pahamen mavire GYahudi nanyahanes pem Tanyeim pani mame moauk saaf kam Lasarus pieh fonofus pigini saaf. \v 10 Mosuk imem amenyeh kam amtacahanes Lasarus susukiev icam. \v 11 Pani ker Lasarus pafi kam onove yemse tomsevnes ekemi pani ikarum pam Tabnyeim. -<<<<<<< HEAD \p -Tabnyeim Yevus Pogom Okom Yerusalem Pani Raja -======= -(Tabnyeim Yevus Pogom Okom Yerusalem Pani Raja) ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +Tabnyeim Yevus Pogom Okom Yerusalem Pani Raja \ No newline at end of file diff --git a/21/24.txt b/21/24.txt index 916d373..395b648 100644 --- a/21/24.txt +++ b/21/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Ekemi pani haife ani nanim pan pahamen maraf, ma pahamen curumacahanes pani morgus nifi nanim pani ifa ikarum afipan ikarum. \v 25 Pafi emos kyef pefeni Aiahafor asta atogomaspani, mopefeni cucuros atogomas pasia pani piraf-pirahaf, naha finen togomef pahamen hocaabmpam pani kahane memedi tahamguti pahamen wafi hatef AI kome kyef pam na cucumaacahanikatneipani -======= -\v 24 Ekemi pani haife ani nanim pan pahamen maraf,ma pahamen curumacahanes pani morgus nifi nanim pani ifa ikarum afipan ikarum. \v 25 Pafi emos kyef pefeni Aiahafor asta atogomaspani,mopefeni cucuros atogomas pasia pani piraf-pirahaf,naha finen togomef pahamen hocaabmpam pani kahane memedi tahamguti pahamen wafi hatef AI kome kyef pam na cucumaacahanikatneipani ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 24 Ekemi pani haife ani nanim pan pahamen maraf, ma pahamen curumacahanes pani morgus nifi nanim pani ifa ikarum afipan ikarum. \v 25 Pafi emos kyef pefeni Aiahafor asta atogomaspani, mopefeni cucuros atogomas pasia pani piraf-pirahaf, naha finen togomef pahamen hocaabmpam pani kahane memedi tahamguti pahamen wafi hatef AI kome kyef pam na cucumaacahanikatneipani \ No newline at end of file