From 02d466dbe3a2b4f9eac99edf2d32946e89f15cac Mon Sep 17 00:00:00 2001 From: "bahasatech.indotimur" Date: Fri, 5 Apr 2024 11:50:46 +0900 Subject: [PATCH] Fri Apr 05 2024 11:50:45 GMT+0900 (Japan Standard Time) --- 08/01.txt | 6 +----- 08/04.txt | 6 +----- 08/07.txt | 6 +----- 08/09.txt | 6 +----- 08/12.txt | 6 +----- 08/14.txt | 6 +----- 08/17.txt | 6 +----- 08/19.txt | 6 +----- 08/23.txt | 6 +----- 9 files changed, 9 insertions(+), 45 deletions(-) diff --git a/08/01.txt b/08/01.txt index a36385d..1bbac54 100644 --- a/08/01.txt +++ b/08/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 8 \v 1 Pani kerno, Ai sefos Zaitun taru pegef. \v 2 Ifa usumufteref, ekemi pieh huwis Ai ahaf, kema waukam mosuk pahamen enefe yemseh reimohanes ekemi kafon. Ekemi cemsuk mas afi waseenof atogomas ekemenei kafon. \v 3 Mosuk, auhye-auhye ketenebm mosuk farisi mafire pani afcahai pirahaf Yohanes tere morgus pogom eifeakaipani maatenem kokotenem, morgus afina ameeisuk penedes pegian afeaharaf pani submait naameahmas. -======= -\c 8 \v 1 Pani kerno,Ai sefos Zaitun taru pegef. \v 2 Ifa usumufteref,ekemi pieh huwis Ai ahaf,kema waukam mosuk pahamen enefe yemseh reimohanes ekemi kafon. ekemi cemsuk mas afi waseenof atogomas ekemenei kafon. \v 3 Mosuk,auhye-auhye ketenebm mosuk farisi mafire pani afcahai pirahaf Yohanes tere morgus pogom eifeakaipani maatenem kokotenem,morgus afina ameeisuk penedes pegian afeaharaf pani submait naameahmas. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\c 8 \v 1 Pani kerno, Ai sefos Zaitun taru pegef. \v 2 Ifa usumufteref, ekemi pieh huwis Ai ahaf, kema waukam mosuk pahamen enefe yemseh reimohanes ekemi kafon. Ekemi cemsuk mas afi waseenof atogomas ekemenei kafon. \v 3 Mosuk, auhye-auhye ketenebm mosuk farisi mafire pani afcahai pirahaf Yohanes tere morgus pogom eifeakaipani maatenem kokotenem, morgus afina ameeisuk penedes pegian afeaharaf pani submait naameahmas. \ No newline at end of file diff --git a/08/04.txt b/08/04.txt index 06a7102..bf3cacb 100644 --- a/08/04.txt +++ b/08/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Ekemenai pani Ai ahaf kafonyoni amnaas "Guru, pegem aemharof pam yeifaani pam mou tenem fahomi paniker. \v 5 Buh woukempani auh inyenom pani, Musar fani aafemipani nifipani petem kahane mafhai paf pakuh yawi aerteni piginyoh inyoutere. Tamkahane finan anum pegemkahanepam? \v 6 Ekemenei panifaniaamnaaneipani Aiahaf aamasaafkertere morgus ekemenei pani afi ahanigir kertere kahaf asmenefpani ekemi kafon yabm asmenofmentof afi ahamgir kentere kokof asmenefpani ekemi kafon yebm asmenofmentis ukem yeni yabm unumok. -======= -\v 4 Ekemenai pani Ai ahaf kafonyoni amnaas "Guru,pegem aemharof pam yeifaani pam mou tenem fahomi paniker. \v 5 Buh woukempani auh inyenom pani,Musar fani aafemipani nifipani petem kahane mafhai paf pakuh yawi aerteni piginyoh inyoutere. tamkahane finan anum pegemkahanepam? \v 6 Ekemenei panifaniaamnaaneipani Aiahaf aamasaafkertere morgus ekemenei pani afi ahanigir kertere kahaf asmenefpani ekemi kafon yabm asmenofmentof afi ahamgir kentere kokof asmenefpani ekemi kafon yebm asmenofmentis ukem yeni yabm unumok. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 4 Ekemenai pani Ai ahaf kafonyoni amnaas "Guru, pegem aemharof pam yeifaani pam mou tenem fahomi paniker. \v 5 Buh woukempani auh inyenom pani, Musar fani aafemipani nifipani petem kahane mafhai paf pakuh yawi aerteni piginyoh inyoutere. Tamkahane finan anum pegemkahanepam? \v 6 Ekemenei panifaniaamnaaneipani Aiahaf aamasaafkertere morgus ekemenei pani afi ahanigir kertere kahaf asmenefpani ekemi kafon yabm asmenofmentof afi ahamgir kentere kokof asmenefpani ekemi kafon yebm asmenofmentis ukem yeni yabm unumok. \ No newline at end of file diff --git a/08/07.txt b/08/07.txt index c3932c2..896cf59 100644 --- a/08/07.txt +++ b/08/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Morgus ekemenenpani pieh fonse-piehfonse asentahami paniker ekemi kafos AI ahaf tamgansuk ekemni kafon pensaf fagomas,"iyeh yabmpafi mentaf piginir koramguti batu pani afeaharafpansafgomas" iyeh yabmpafi mentaf piginir koramguti batu pani afeaharaf afon. \v 8 Morgus, Ai ahaf pi cemos yani ukem eem afi curumaatis pieh ukem em. -======= -\v 7 Morgus ekemenenpani pieh fonse-piehfonse asentahami paniker ekemi kafos AI ahaf tamgansuk ekemni kafon pensaf fagomas,"iyeh yabmpafi mentaf piginir koramguti batu pani afeaharafpansafgomas" iyeh yabmpafi mentaf piginir koramguti batu pani afeaharaf afon. \v 8 Morgus,Ai ahaf pi cemos yani ukem eem afi curumaatis pieh ukem em. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 7 Morgus ekemenenpani pieh fonse-piehfonse asentahami paniker ekemi kafos AI ahaf tamgansuk ekemni kafon pensaf fagomas,"iyeh yabmpafi mentaf piginir koramguti batu pani afeaharafpansafgomas" iyeh yabmpafi mentaf piginir koramguti batu pani afeaharaf afon. \v 8 Morgus, Ai ahaf pi cemos yani ukem eem afi curumaatis pieh ukem em. \ No newline at end of file diff --git a/08/09.txt b/08/09.txt index 50f6851..0d9b2e3 100644 --- a/08/09.txt +++ b/08/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Morgus ekemone pergom kyaf iceesuk ekemni afi sefenes piraf sem pirahaf sim amnaas ifa ifuk nim, mo Ai ahaf temosefenes ahun nimtef, morgus acai piraf pagem pasin bwut tacemi pegem pasin. \v 10 Morgus, AI ahaf tamgansuk nas foni amgamop pogom afcahamef kafon pani "Hai aha acaharaf,ahatagef aani? mameh pefeni mafirenyeh bah eesahamek aani? \v 11 Pagan acaharaf pogomar fastere, mameh Ai ahaf tamahami Ai ahafor pani amgomas, naha pani aani kafon buih eemameh. saum,mosuk pogosaanok pani yabm pasi teni teiyohom peis. -======= -\v 9 Morgus ekemone pergom kyaf iceesuk ekemni afi sefenes piraf sem pirahaf sim amnaas ifa ifuk nim,mo Ai ahaf temosefenes ahun nimtef,morgus acai piraf pagem pasin bwut tacemi pegem pasin. \v 10 Morgus,AI ahaf tamgansuk nas foni amgamop pogom afcahamef kafon pani "Hai aha acaharaf,ahatagef aani? mameh pefeni mafirenyeh bah eesahamek aani? \v 11 Pagan acaharaf pogomar fastere,mameh Ai ahaf tamahami Ai ahafor pani amgomas,naha pani aani kafon buih eemameh. saum,mosuk pogosaanok pani yabm pasi teni teiyohom peis. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 9 Morgus ekemone pergom kyaf iceesuk ekemni afi sefenes piraf sem pirahaf sim amnaas ifa ifuk nim, mo Ai ahaf temosefenes ahun nimtef, morgus acai piraf pagem pasin bwut tacemi pegem pasin. \v 10 Morgus, AI ahaf tamgansuk nas foni amgamop pogom afcahamef kafon pani "Hai aha acaharaf,ahatagef aani? mameh pefeni mafirenyeh bah eesahamek aani? \v 11 Pagan acaharaf pogomar fastere, mameh Ai ahaf tamahami Ai ahafor pani amgomas, naha pani aani kafon buih eemameh. saum,mosuk pogosaanok pani yabm pasi teni teiyohom peis. \ No newline at end of file diff --git a/08/12.txt b/08/12.txt index 4107e1f..c3386b4 100644 --- a/08/12.txt +++ b/08/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Morgus, Ai ahaf fani amgomas iyeh pafipagoni kafonpani,"Nahapani esigis nim, pahamen enefe yemse naah pasin wahani fnei peni omafuf anefkefmeme, eebm pani ifa esigis koma aamsuk kahani kafnei. \v 13 Panikerma faris mafirer fani amanos Ai ahaf kafon, Igimah pani fafun igima kome otohompani morgus ifuk faifrem foni aafemkyef pani ikarum mame. -======= -\v 12 Morgus,Ai ahaf fani amgomas iyeh pafipagoni kafonpani,"Nahapani esigis nim,pahamen enefe yemse naah pasin wahani fnei peni omafuf anefkefmeme,eebm pani ifa esigis koma aamsuk kahani kafnei. \v 13 Panikerma faris mafirer fani amanos Ai ahaf kafon,Igimah pani fafun igima kome otohompani morgus ifuk faifrem foni aafemkyef pani ikarum mame. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 12 Morgus, Ai ahaf fani amgomas iyeh pafipagoni kafonpani,"Nahapani esigis nim, pahamen enefe yemse naah pasin wahani fnei peni omafuf anefkefmeme, eebm pani ifa esigis koma aamsuk kahani kafnei. \v 13 Panikerma faris mafirer fani amanos Ai ahaf kafon, Igimah pani fafun igima kome otohompani morgus ifuk faifrem foni aafemkyef pani ikarum mame. \ No newline at end of file diff --git a/08/14.txt b/08/14.txt index be80e03..5ed4541 100644 --- a/08/14.txt +++ b/08/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Ai ahafar faniamgomas ekemenei kafon, panikerma naha niginakomo otoham kyek fahamgubm niginar, kyefnam pani pegemkahane, ikarum panikerma nahananim naha tagebm mecifmargus tagem masefef, morgus aani nanim mame nahatagebm mecif mosuk tagef naha sefef. \v 15 Aani igimani koma kweeh yaham ekemok amukmen morgus naha pani tenimame niginakomo manakafi tenimame. \v 16 Morgus, peni pasin pani naha nigina kemok, morgu niginakomo pani ekerum panikerma naha pani pefeni mafirepan teni meme morgus pefenir pasin forgus Aihr fani amgomas naah kafon. -======= -\v 14 Ai ahafar faniamgomas ekemenei kafon,panikerma naha niginakomo otoham kyek fahamgubm niginar,kyefnam pani pegemkahane,ikarum panikerma nahananim naha tagebm mecifmargus tagem masefef,morgus aani nanim mame nahatagebm mecif mosuk tagef naha sefef. \v 15 Aani igimani koma kweeh yaham ekemok amukmen morgus naha pani tenimame niginakomo manakafi tenimame. \v 16 Morgus,peni pasin pani naha nigina kemok,morgu niginakomo pani ekerum panikerma naha pani pefeni mafirepan teni meme morgus pefenir pasin forgus Aihr fani amgomas naah kafon. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 14 Ai ahafar faniamgomas ekemenei kafon, panikerma naha niginakomo otoham kyek fahamgubm niginar, kyefnam pani pegemkahane, ikarum panikerma nahananim naha tagebm mecifmargus tagem masefef, morgus aani nanim mame nahatagebm mecif mosuk tagef naha sefef. \v 15 Aani igimani koma kweeh yaham ekemok amukmen morgus naha pani tenimame niginakomo manakafi tenimame. \v 16 Morgus, peni pasin pani naha nigina kemok, morgu niginakomo pani ekerum panikerma naha pani pefeni mafirepan teni meme morgus pefenir pasin forgus Aihr fani amgomas naah kafon. \ No newline at end of file diff --git a/08/17.txt b/08/17.txt index 17a9ed6..db7e695 100644 --- a/08/17.txt +++ b/08/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Ebm, AI ahaf komawofi hafef tacemi ounyenom kyefpani curumaacahanes pani ifuk ferem fagomas kyef pani ikerumcabm yer afangpani. \v 18 Naha kyef fani aafemaf pam nigina komo otaham kyef niginar margus Aih foni amahami naha kyef foni aafem afahami naah kyef. -======= -\v 17 Ebm,AI ahaf komawofi hafef tacemi ounyenom kyefpani curumaacahanes pani ifuk ferem fagomas kyef pani ikerumcabm yer afangpani. \v 18 Naha kyef fani aafemaf pam nigina komo otaham kyef niginar margus Aih foni amahami naha kyef foni aafem afahami naah kyef. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 17 Ebm, AI ahaf komawofi hafef tacemi ounyenom kyefpani curumaacahanes pani ifuk ferem fagomas kyef pani ikerumcabm yer afangpani. \v 18 Naha kyef fani aafemaf pam nigina komo otaham kyef niginar margus Aih foni amahami naha kyef foni aafem afahami naah kyef. \ No newline at end of file diff --git a/08/19.txt b/08/19.txt index a557765..aafb927 100644 --- a/08/19.txt +++ b/08/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 Morgus, ekemenei kefon fansaaf aamahamei" "itagefas Aih anum? Ai ahafor fas, aami naha nanim mame ma Ai nakom, mosuk Aani naha nanim fetemahani katnenpani aani pasin pani Ai nakom nanim fofemahani katnen. \v 20 Pegem kyef pam Aiahaf foni amgomas perbendaharaan kaarof morgus ekemi pani wasenof AI ahaf, kemo woukam tahani morgus pani iye pani ekemi yeif finen pani afi nim mame pani tamenim naferefmame pani ker. -======= -\v 19 Morgus,ekemenei kefon fansaaf aamahamei" "itagefas Aih anum? Ai ahafor fas,aami naha nanim mame ma Ai nakom,mosuk Aani naha nanim fetemahani katnenpani aani pasin pani Ai nakom nanim fofemahani katnen. \v 20 Pegem kyef pam Aiahaf foni amgomas perbendaharaan kaarof morgus ekemi pani wasenof AI ahaf,kemo woukam tahani morgus pani iye pani ekemi yeif finen pani afi nim mame pani tamenim naferefmame pani ker. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 19 Morgus, ekemenei kefon fansaaf aamahamei" "itagefas Aih anum? Ai ahafor fas, aami naha nanim mame ma Ai nakom, mosuk Aani naha nanim fetemahani katnenpani aani pasin pani Ai nakom nanim fofemahani katnen. \v 20 Pegem kyef pam Aiahaf foni amgomas perbendaharaan kaarof morgus ekemi pani wasenof AI ahaf, kemo woukam tahani morgus pani iye pani ekemi yeif finen pani afi nim mame pani tamenim naferefmame pani ker. \ No newline at end of file diff --git a/08/23.txt b/08/23.txt index d8c7184..4265d78 100644 --- a/08/23.txt +++ b/08/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Panikermo, AI ahafor fani amgomas ekemenei kafon,"aani pani yanik hosefen senen morgus naha pani wafok hosefsef, aani pani yani nacaabm pegebm, mosrgus naha pani pegem yani hocaabm memeh. \v 24 Panikermo, naha fani aafemofpan angefi pani aani kanifini katnen yabm pafi igimaanikoma pebm morgus penikerma, aani pani kifta mame panikerma, ikarum afinim, nahapani ekemir, aani kanifinikaten pani yabm pasi-yabm pafi ekempebm. -======= -\v 23 Panikermo,AI ahafor fani amgomas ekemenei kafon,"aani pani yanik hosefen senen morgus naha pani wafok hosefsef,aani pani yani nacaabm pegebm,mosrgus naha pani pegem yani hocaabm memeh. \v 24 Panikermo,naha fani aafemofpan angefi pani aani kanifini katnen yabm pafi igimaanikoma pebm morgus penikerma,aani pani kifta mame panikerma,ikarum afinim,nahapani ekemir,aani kanifinikaten pani yabm pasi-yabm pafi ekempebm. ->>>>>>> 3ca9b6cfd7ec2402bdeb7a1aba71aeca218938ab +\v 23 Panikermo, AI ahafor fani amgomas ekemenei kafon,"aani pani yanik hosefen senen morgus naha pani wafok hosefsef, aani pani yani nacaabm pegebm, mosrgus naha pani pegem yani hocaabm memeh. \v 24 Panikermo, naha fani aafemofpan angefi pani aani kanifini katnen yabm pafi igimaanikoma pebm morgus penikerma, aani pani kifta mame panikerma, ikarum afinim, nahapani ekemir, aani kanifinikaten pani yabm pasi-yabm pafi ekempebm. \ No newline at end of file