From e4d0b1979fec21f90c2c85fae50bb82ef8d6d83a Mon Sep 17 00:00:00 2001 From: "bahasatech.indobarat" Date: Thu, 5 Sep 2024 17:16:06 +0700 Subject: [PATCH] Thu Sep 05 2024 17:16:06 GMT+0700 (Indochina Time) --- 03/26.txt | 6 +----- 03/28.txt | 6 +----- 03/31.txt | 6 +----- 03/33.txt | 6 +----- 04/01.txt | 6 +----- manifest.json | 5 +++++ 6 files changed, 10 insertions(+), 25 deletions(-) diff --git a/03/26.txt b/03/26.txt index f42ab37..7783180 100644 --- a/03/26.txt +++ b/03/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Aka te suang kerajaan iblis tepisah nelang bemusuh, kerajaan iro sa tahan ola nelang pasti sagar jaweh. \v 27 Beloh sunah erai ke ulun mahan masuk tong suang belai erai ulun ye gagah kuat pelos ngerampas harta da aka da sa one nyuruk ulun gagah kuat iro, ali iro, kado da mahan ngerampas harta ye. -======= -\v 26 Amun iblis te bangkit melawan biti awi tapisah-pisah ye jida kawwa batahan, riwayat ewen berakhir. \v 27 Jida ada miji pun je hawa tame kan huma uluh je kuat langsung manakau harta benda e, kacuali iye lebih helu mahuruk uluh kuat te hanyar iye kawa marampok humai e. ->>>>>>> 45fa73c893a2ed9354644593ccc9f6dcbebbd494 +\v 26 Aka te suang kerajaan iblis tepisah nelang bemusuh, kerajaan iro sa tahan ola nelang pasti sagar jaweh. \v 27 Beloh sunah erai ke ulun mahan masuk tong suang belai erai ulun ye gagah kuat pelos ngerampas harta da aka da sa one nyuruk ulun gagah kuat iro, ali iro, kado da mahan ngerampas harta ye. \ No newline at end of file diff --git a/03/28.txt b/03/28.txt index 75169fd..c58ed5f 100644 --- a/03/28.txt +++ b/03/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Buen kam ketoan,! aka ulun ngene dosa nelang ngulek pedai,da tau na ampun. \v 29 Et aka da pedai Roh kudus da sa tau na ampun.! leka pedai iro puna dosa ye kekal." \v 30 Yesus ngulek nget iro leka naan ulun ye ngulek Yesus kerasukan roh daat. -======= -\v 28 Yaku mancaruman sebujur e akam, samandeah dosa anak-anak manusia te kawa iampuni, bahkan bapire hujatan je inyeut ewn. \v 29 Libah te eweh je menghujat roh je barasih jida kawa iampuni, selain awi basala awi dosa. \v 30 Awe Ahli-ahli Taurat te manyeut, iye dirasuk roh najis. ->>>>>>> 45fa73c893a2ed9354644593ccc9f6dcbebbd494 +\v 28 Buen kam ketoan,! aka ulun ngene dosa nelang ngulek pedai,da tau na ampun. \v 29 Et aka da pedai Roh kudus da sa tau na ampun.! leka pedai iro puna dosa ye kekal." \v 30 Yesus ngulek nget iro leka naan ulun ye ngulek Yesus kerasukan roh daat. \ No newline at end of file diff --git a/03/31.txt b/03/31.txt index c6d6e5e..7fc3f0d 100644 --- a/03/31.txt +++ b/03/31.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -= Keluarga Yesus ye sebene ye.= \v 31 Uli iro ne ali kawan erai butung Yesus sulet,dali ngeringa te ongon desung nyiu ulun nook Yesus. \v 32 Kede iro ulun deo rahat tuet geliling Yesus .dali ngulek tong da, Guru, ne ali kawan erai butung ko naan te ongon,dali ngeto ko. -======= -\v 31 Libah te, umai dingan iwen pahari dumah trus mindang siluar huma. Ewen mingahu iye. \v 32 Kirumunan uluh are parahatan mindah mangalilingi Yesus lalu iwen mancaruman akai, alang, umam dengan ewen pahari em, siluar sambil mangau ikau. ->>>>>>> 45fa73c893a2ed9354644593ccc9f6dcbebbd494 +Keluarga Yesus ye sebene ye \v 31 Uli iro ne ali kawan erai butung Yesus sulet,dali ngeringa te ongon desung nyiu ulun nook Yesus. \v 32 Kede iro ulun deo rahat tuet geliling Yesus .dali ngulek tong da, Guru, ne ali kawan erai butung ko naan te ongon,dali ngeto ko. \ No newline at end of file diff --git a/03/33.txt b/03/33.txt index 6c94158..65e5688 100644 --- a/03/33.txt +++ b/03/33.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 33 Yesus ngulek, dase ne Ab,! dase kawan erai butung ab.! \v 34 Uli iro da kite tong kawan ulun ye tuet geliling da pelos ngulek,ihe ne ali kawan erai butung ab.! \v 35 Ulun ye nam pelos kehendak Allah, da erai butung ab upo, erai butung ab bawe, nelang ne ab. -======= -\v 33 Yesus manjawab iwen sambil bapander eweh lah uma ku dingan pahari-pahari ku? \v 34 Libah te, iye maalang uluh-uluh je mandak mengililingi iye bapander, alang, jitu je uma ku wan pahari-pahari ku! \v 35 Awi eweh beh je maawi kahandak Allah te ye lahpahari ku hatue, dan Iye hia pahari ku je bawi dan uma ku. ->>>>>>> 45fa73c893a2ed9354644593ccc9f6dcbebbd494 +\v 33 Yesus ngulek, dase ne Ab,! dase kawan erai butung ab.! \v 34 Uli iro da kite tong kawan ulun ye tuet geliling da pelos ngulek,ihe ne ali kawan erai butung ab.! \v 35 Ulun ye nam pelos kehendak Allah, da erai butung ab upo, erai butung ab bawe, nelang ne ab. \ No newline at end of file diff --git a/04/01.txt b/04/01.txt index 2d0004a..107bb95 100644 --- a/04/01.txt +++ b/04/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -= Perumpamaan nget erai ulun ngasek bini.= \v 1 Yesus ngajar eso te diding danau Galilea deo bene ulun ngerumung da.leka iro da tulak tuet te suang jukung te danau, ulun deo iro jakat te diding danau. \v 2 Yesus ngajar nget deo hal tong dali ali makai peribahasa, nget ihe da ngajar dali. -======= -\c 4 \v 1 Dan Yesus mulai maanjat hindai si saran danau, maka uluh are mangarumuni Yesus jumlah e are bujur sehingga Iye rame ka huang jukung munduk hite. Sementara uluh are munduk si saaran danau. \v 2 Da, Iye maajar ewen tantang are hal lawan ibarat-ibarat huang pangajaraan Iye, Iye baoander ka ewen. ->>>>>>> 45fa73c893a2ed9354644593ccc9f6dcbebbd494 +\c 4 Perumpamaan nget erai ulun ngasek bini \v 1 Yesus ngajar eso te diding danau Galilea deo bene ulun ngerumung da.leka iro da tulak tuet te suang jukung te danau, ulun deo iro jakat te diding danau. \v 2 Yesus ngajar nget deo hal tong dali ali makai peribahasa, nget ihe da ngajar dali. \ No newline at end of file diff --git a/manifest.json b/manifest.json index fa8310a..c24a398 100644 --- a/manifest.json +++ b/manifest.json @@ -85,7 +85,12 @@ "03-17", "03-20", "03-23", + "03-26", + "03-28", + "03-31", + "03-33", "04-title", + "04-01", "05-title", "06-title", "07-title",