From e997d79fe69db79425093ee8ba662fbd24a06d50 Mon Sep 17 00:00:00 2001 From: "bahasatech.indotimur" Date: Wed, 3 Apr 2024 17:35:07 +0900 Subject: [PATCH] Wed Apr 03 2024 17:35:06 GMT+0900 (Japan Standard Time) --- 01/01.txt | 6 +----- 01/16.txt | 6 +----- 01/24.txt | 6 +----- 01/26.txt | 7 +------ 01/29.txt | 6 +----- 01/32.txt | 6 +----- 01/37.txt | 6 +----- 01/40.txt | 6 +----- 01/43.txt | 6 +----- 01/46.txt | 6 +----- 01/49.txt | 6 +----- 02/01.txt | 6 +----- 02/09.txt | 6 +----- 02/11.txt | 7 +------ 02/12.txt | 7 +------ 02/13.txt | 6 +----- 02/15.txt | 6 +----- 02/20.txt | 6 +----- 03/01.txt | 6 +----- 03/19.txt | 6 +----- manifest.json | 1 + 21 files changed, 21 insertions(+), 103 deletions(-) diff --git a/01/01.txt b/01/01.txt index 1d209f5..8cdcb44 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD \c 1 Upmmaski Naimap Weime Houm Bep Amroh -\p \v 1 Amar waam yap om raan,Raam om waspahgi Om Ar ahpis pem raam om Aar. \v 2 Ram om weimeki waspahgi om Ar ahpis om omor waam yapki. \v 3 Waspagi yasap-yasap akin baitn arkujm om omre.Om maam,waspahgi yasap-yasap akin om weimeki am raam om ine pahmakin om raapy. -======= -\c 1 (Upmmaski Naimap Weime Houm Bep Amroh) \v 1 Amar waam yap om raan,Raam om waspahgi Om Ar ahpis pem raam om Aar. \v 2 Ram om weimeki waspahgi om Ar ahpis om omor waam yapki. \v 3 Waspagi yasap-yasap akin baitn arkujm om omre.Om maam,waspahgi yasap-yasap akin om weimeki am raam om ine pahmakin om raapy. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\p \v 1 Amar waam yap om raan,Raam om waspahgi Om Ar ahpis pem raam om Aar. \v 2 Ram om weimeki waspahgi om Ar ahpis om omor waam yapki. \v 3 Waspagi yasap-yasap akin baitn arkujm om omre. Om maam, waspahgi yasap-yasap akin om weimeki am raam om ine pahmakin om raapy. \ No newline at end of file diff --git a/01/16.txt b/01/16.txt index 2197c91..2984c46 100644 --- a/01/16.txt +++ b/01/16.txt @@ -1,7 +1,3 @@ \v 16 Om amar kepenuhan enemri,dep waspahgi hepen kumni ohoiyare matam pemki pemro. \v 17 Pe Hukum Taurat om har penkum Musa ahrki;pe anugrah pem yeraraam yap om houm Yeisi Kristus ahrki. \v 18 Ini yanap pahmakin sahpy Ar Ahin,pe raapAr Ahm,om woii pengakuan Aii ahmro,fohmum omre. -<<<<<<< HEAD \p - Roh Boup Yohanes Pembabtis Ahm -======= -(Roh Boup Yohanes Pembabtis Ahm) ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 + Roh Boup Yohanes Pembabtis Ahm \ No newline at end of file diff --git a/01/24.txt b/01/24.txt index 6819abd..0de48b4 100644 --- a/01/24.txt +++ b/01/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Yanap Yahudi yap omfe waski kaumairenki om omor Farisi yanap. \v 25 Omki enere fenkum om Yohanes ahro, pe ah ine au Mesias, ine au Elia,pem om ine au nabi om,bekem fakin ah babtis yab arkenon? -======= -\v 24 Yanap Yahudi yap omfe waski kaumairenki om omor Farisi yanap. \v 25 Omki enere fenkum om Yohanes ahro,pe ah ine au Mesias,ine au Elia,pem om ine au nabi om,bekem fakin ah babtis yab arkenon? ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 24 Yanap Yahudi yap omfe waski kaumairenki om omor Farisi yanap. \v 25 Omki enere fenkum om Yohanes ahro, pe ah ine au Mesias, ine au Elia,pem om ine au nabi om,bekem fakin ah babtis yab arkenon? \ No newline at end of file diff --git a/01/26.txt b/01/26.txt index 36a4a78..60fc314 100644 --- a/01/26.txt +++ b/01/26.txt @@ -1,8 +1,3 @@ -<<<<<<< HEAD \v 26 Yohanes fohmum enero, dahre yap arkefop babtis ohomki, pe ahan omro pahmakin ekamahnro pahmakin om ine sahpe. \v 27 Omro om houfeitn, dahki om weiki.Feifi rom sendal enemrohm dah ine itnepki. \v 28 Waspahgi om farufeitn woi Betaniaro, omor weraupam buru Yordan omoro,mimi ahm Yohanes pembabtis omro. \p -Raap Domba Ar Ahm -======= -\v 26 Yohanes fohmum enero,dahre yap arkefop babtis ohomki,pe ahan omro pahmakin ekamahnro pahmakin om ine sahpe. \v 27 Omro om houfeitn,dahki om weiki.Feifi rom sendal enemrohm dah ine itnepki. \v 28 Waspahgi om farufeitn woi Betaniaro,omor weraupam buru Yordan omoro,mimi ahm Yohanes pembabtis omro. -(Raap Domba Ar Ahm) ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +Raap Domba Ar Ahm \ No newline at end of file diff --git a/01/29.txt b/01/29.txt index 9382593..494c54b 100644 --- a/01/29.txt +++ b/01/29.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 29 suprahm taam om,Yohanes sahpy Yeisi ahin semhoum omoro omki fohmum Yohanes ahre.Sahiyam raap Domba Ar Ahm.Omre ririfaitn yahpsane beb am. \v 30 Omor om dahre fohm arap om, omki dahre fep, omki om dah semhoupfop yanap-yanap akin om trimofu ah iki omor om weimki yuproh dah maamki. \v 31 Weimeki,dah sapae ine om, pe omki omor om fare fakin om Israel yanap om.Omki dah haoup yap arufop babtisan ohmki." -======= -\v 29 suprahm taam om,Yohanes sahpy Yeisi ahin semhoum omoro omki fohmum Yohanes ahre.Sahiyam raap Domba Ar Ahm.Omre ririfaitn yahpsane beb am. \v 30 Omor om dahre fohm arap om,omki dahre fep,omki om dah semhoupfop yanap-yanap akin om trimofu ah iki omor om weimki yuproh dah maamki. \v 31 Weimeki,dah sapae ine om,pe omki omor om fare fakin om Israel yanap om.Omki dah haoup yap arufop babtisan ohmki." ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 29 suprahm taam om,Yohanes sahpy Yeisi ahin semhoum omoro omki fohmum Yohanes ahre.Sahiyam raap Domba Ar Ahm.Omre ririfaitn yahpsane beb am. \v 30 Omor om dahre fohm arap om, omki dahre fep, omki om dah semhoupfop yanap-yanap akin om trimofu ah iki omor om weimki yuproh dah maamki. \v 31 Weimeki,dah sapae ine om, pe omki omor om fare fakin om Israel yanap om.Omki dah haoup yap arufop babtisan ohmki." \ No newline at end of file diff --git a/01/32.txt b/01/32.txt index b304109..e41f511 100644 --- a/01/32.txt +++ b/01/32.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 32 Pem Yohanes farfur, rohenem, dahre sahrap roh om suruepe wapki eimohm kapki omor merpati spam omor paski pemroh om mimi omro. \v 33 Dah ohona sahpae ine om, pe omfe om dah kahumari nim om babtis fakir ohomki fahare Ahanro,omre om wapina rohom ahan sahpae suru epe Roh Kudus omki mimi.Omor omre yaparufeitn bantisan Roh Kudus ki.' \v 34 Dahare ohona sahpop pem harpahepop kesaksian om omor am raap Ar Ahm. -======= -\v 32 Pem Yohanes farfur,rohenem,dahre sahrap roh om suruepe wapki eimohm kapki omor merpati spam omor paski pemroh om mimi omro. \v 33 Dah ohona sahpae ine om,pe omfe om dah kahumari nim om babtis fakir ohomki fahare Ahanro,omre om wapina rohom ahan sahpae suru epe Roh Kudus omki mimi.Omor omre yaparufeitn bantisan Roh Kudus ki.' \v 34 Dahare ohona sahpop pem harpahepop kesaksian om omor am raap Ar Ahm. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 32 Pem Yohanes farfur, rohenem, dahre sahrap roh om suruepe wapki eimohm kapki omor merpati spam omor paski pemroh om mimi omro. \v 33 Dah ohona sahpae ine om, pe omfe om dah kahumari nim om babtis fakir ohomki fahare Ahanro,omre om wapina rohom ahan sahpae suru epe Roh Kudus omki mimi.Omor omre yaparufeitn bantisan Roh Kudus ki.' \v 34 Dahare ohona sahpop pem harpahepop kesaksian om omor am raap Ar Ahm. \ No newline at end of file diff --git a/01/37.txt b/01/37.txt index 477596d..00fd7e8 100644 --- a/01/37.txt +++ b/01/37.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 37 Tuski murid enem, yiriaim roh boup enem,om omki ipopki Yeisi ahro. \v 38 Yeisi sahm eina remtemum aparupo omki sahpum eneroh en ipopki omore,omki fohmum enero,bekeme om ahan haah?Enere fenkum omoro, Rabi(Guru)tamroh in ahh mimi? \v 39 Om fohmum enro,eisepm omki ahn sahpayafiren."Wonaki omki en honpiren pem sahyafeitn, om fakir mimi pem en mimi waspahgi ram taam om, omor taam om enem amar ampaski taam kesepuluh. -======= -\v 37 Tuski murid enem,yiriaim roh boup enem,om omki ipopki Yeisi ahro. \v 38 Yeisi sahm eina remtemum aparupo omki sahpum eneroh en ipopki omore,omki fohmum enero,bekeme om ahan haah?Enere fenkum omoro,Rabi(Guru)tamroh in ahh mimi? \v 39 Om fohmum enro,eisepm omki ahn sahpayafiren."Wonaki omki en honpiren pem sahyafeitn,om fakir mimi pem en mimi waspahgi ram taam om,omor taam om enem amar ampaski taam kesepuluh. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 37 Tuski murid enem, yiriaim roh boup enem,om omki ipopki Yeisi ahro. \v 38 Yeisi sahm eina remtemum aparupo omki sahpum eneroh en ipopki omore,omki fohmum enero,bekeme om ahan haah?Enere fenkum omoro, Rabi(Guru)tamroh in ahh mimi? \v 39 Om fohmum enro,eisepm omki ahn sahpayafiren."Wonaki omki en honpiren pem sahyafeitn, om fakir mimi pem en mimi waspahgi ram taam om, omor taam om enem amar ampaski taam kesepuluh. \ No newline at end of file diff --git a/01/40.txt b/01/40.txt index 97e3cd9..ec1e2b9 100644 --- a/01/40.txt +++ b/01/40.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 40 Pahmo nim yirahpsepe yoo tuski omkayap yirari roh moup Yohanes ahn omki ipopki Yeisi ahro.Om omor Andreas, yunim Simon Petrus ahn. \v 41 Tenaski Andreas tupsatne Simon, pem yunim enem, pem fohr pakum ahan om waski foyapafirem,dep weime yahiamop Mesias om(Waski pahpriam non ne am, Kristus) \v 42 Wonahki Andreas yahpsepy Simon ain omor Yeisi ahro, Yeisi sahpum Simon ain pem omki fohmum, ahain Simon raap Yohanes ahn. Ahan waski foiyaifeitn Kefasahre (Om omor Petrus ahain pem Batu)" -======= -\v 40 Pahmo nim yirahpsepe yoo tuski omkayap yirari roh moup Yohanes ahn omki ipopki Yeisi ahro.Om omor Andreas,yunim Simon Petrus ahn. \v 41 Tenaski Andreas tupsatne Simon,pem yunim enem,pem fohr pakum ahan om waski foyapafirem,dep weime yahiamop Mesias om(Waski pahpriam non ne am,Kristus) \v 42 Wonahki Andreas yahpsepy Simon ain omor Yeisi ahro,Yeisi sahpum Simon ain pem omki fohmum,ahain Simon raap Yohanes ahn.Ahan waski foiyaifeitn Kefasahre(Om omor Petrus ahain pem Batu)" ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 40 Pahmo nim yirahpsepe yoo tuski omkayap yirari roh moup Yohanes ahn omki ipopki Yeisi ahro.Om omor Andreas,yunim Simon Petrus ahn. \v 41 Tenaski Andreas tupsatne Simon,pem yunim enem,pem fohr pakum ahan om waski foyapafirem,dep weime yahiamop Mesias om(Waski pahpriam non ne am,Kristus) \v 42 Wonahki Andreas yahpsepy Simon ain omor Yeisi ahro,Yeisi sahpum Simon ain pem omki fohmum,ahain Simon raap Yohanes ahn.Ahan waski foiyaifeitn Kefasahre(Om omor Petrus ahain pem Batu)" \ No newline at end of file diff --git a/01/43.txt b/01/43.txt index ca9c000..9f6bc58 100644 --- a/01/43.txt +++ b/01/43.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 43 Suprohm taampaski om, Yeisi hamtarimum manipaski woi Galilearo,om fupsahpum Pilipus ahin, pem fohmum enero yirahsepe dahro." \v 44 Pilipus om woi Betsaida yap,yapu mimiahm Andreas Petrus mimi yap enkem. \v 45 Pilipus tubsapum om Natanael ahpis, omki fohmu omoro deptubmsaiamop om, waski terereyap om, mesahre waina Hukum Taurat ro,pem omot nabi re, yah omor Yeisi am Nasaret, raap Yusupam." -======= -\v 43 Suprohm taampaski om,Yeisi hamtarimum manipaski woi Galilearo,om fupsahpum Pilipus ahin,pem fohmum enero yirahsepe dahro." \v 44 Pilipus om woi Betsaida yap,yapu mimiahm Andreas Petrus mimi yap enkem. \v 45 Pilipus tubsapum om Natanael ahpis,omki fohmu omoro deptubmsaiamop om,waski terereyap om,mesahre waina Hukum Taurat ro,pem omot nabi re,yah omor Yeisi am Nasaret,raap Yusupam." ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 43 Suprohm taampaski om,Yeisi hamtarimum manipaski woi Galilearo,om fupsahpum Pilipus ahin,pem fohmum enero yirahsepe dahro." \v 44 Pilipus om woi Betsaida yap,yapu mimiahm Andreas Petrus mimi yap enkem. \v 45 Pilipus tubsapum om Natanael ahpis,omki fohmu omoro deptubmsaiamop om,waski terereyap om,mesahre waina Hukum Taurat ro,pem omot nabi re,yah omor Yeisi am Nasaret,raap Yusupam." \ No newline at end of file diff --git a/01/46.txt b/01/46.txt index cc61bde..629cd66 100644 --- a/01/46.txt +++ b/01/46.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 46 Natanael fohmum enero, tamsekim om yasap om naimap haufeitn wo Nasaret kgi?"Filipus fohmum enero, hoore pem omki sahaiyaam." \v 47 Yeisi sahpum Natanael houm omoro,omor farufur Natanael, fakir seiyaam pahmo nim Israel sejati one konaesahm, weiniekap omoro. \v 48 Natanael fohmum,Taamsekim aah sahpakim dahro?Yeisi fohmum weimeki Pilipus foyape maamki, dah weime sahpuni ahan, omfe ahan ropenkim om yeniem wan konam Ara omro. -======= -\v 46 Natanael fohmum enero,tamsekim om yasap om naimap haufeitn wo Nasaret kgi?"Filipus fohmum enero,hoore pem omki sahaiyaam." \v 47 Yeisi sahpum Natanael houm omoro,omor farufur Natanael,fakir seiyaam pahmo nim Israel sejati one konaesahm,weiniekap omoro. \v 48 Natanael fohmum,Taamsekim aah sahpakim dahro?Yeisi fohmum weimeki Pilipus foyape maamki,dah weime sahpuni ahan,omfe ahan ropenkim om yeniem wan konam Ara omro. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 46 Natanael fohmum enero,tamsekim om yasap om naimap haufeitn wo Nasaret kgi?"Filipus fohmum enero,hoore pem omki sahaiyaam." \v 47 Yeisi sahpum Natanael houm omoro,omor farufur Natanael,fakir seiyaam pahmo nim Israel sejati one konaesahm,weiniekap omoro. \v 48 Natanael fohmum,Taamsekim aah sahpakim dahro?Yeisi fohmum weimeki Pilipus foyape maamki,dah weime sahpuni ahan,omfe ahan ropenkim om yeniem wan konam Ara omro. \ No newline at end of file diff --git a/01/49.txt b/01/49.txt index cf4c418..1a120a4 100644 --- a/01/49.txt +++ b/01/49.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 49 Fohmum Natanael,"Rabi,Ah Amar raap ArAhm.Ah Amar Raja, Israel yanpohm." \v 50 Yeisi fohmum, oem roh enem ene rohm,Amr dah fepam, ahanrohm, dah weime sahpop woom ara konomro ropokin, omki ahan yisrahsepy? Ahan ekaman sahpafiren, yasap-yasap om wouru tiri mapu tanam ampaski ine. \v 51 Omki om farsoufeitn, Yeraram yap om dahre feifep Ahan ro, Ahan ekamahn sahiyafiren eimohm tar hoseyap pem malaikat-malaikat Ar Ahm, wapina yaina melayani raap pahmo." -======= -\v 49 fohmum Natanael,"Rabi,Ah Amar raap ArAhm.Ah Amar Raja,Israel yanpohm." \v 50 Yeisi fohmum,oem roh enem ene rohm,Amr dah fepam,ahanrohm,dah weime sahpop woom ara konomro ropokin,omki ahan yisrahsepy?Ahan ekaman sahpafiren,yasap-yasap om wouru tiri mapu tanam ampaski ine. \v 51 Omki om farsoufeitn,Yeraram yap om dahre feifep Ahan ro,Ahan ekamahn sahiyafiren eimohm tar hoseyap pem malaikat-malaikat Ar Ahm,wapina yaina melayani raap pahmo." ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 49 Fohmum Natanael,"Rabi,Ah Amar raap ArAhm.Ah Amar Raja, Israel yanpohm." \v 50 Yeisi fohmum, oem roh enem ene rohm,Amr dah fepam, ahanrohm, dah weime sahpop woom ara konomro ropokin, omki ahan yisrahsepy? Ahan ekaman sahpafiren, yasap-yasap om wouru tiri mapu tanam ampaski ine. \v 51 Omki om farsoufeitn, Yeraram yap om dahre feifep Ahan ro, Ahan ekamahn sahiyafiren eimohm tar hoseyap pem malaikat-malaikat Ar Ahm, wapina yaina melayani raap pahmo." \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index 92c6082..e923c95 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 2 \v 1 Omki taam wadnikesi roki, yapu kana omoro nim doo hape farkum, yame omki pem yapu Galilea omki Yeisi pem enou omoro ropokim. \v 2 Yeisi pem yoyim enem waspahgi foyapenkum doo hepe yame omoro. -======= -\c 2 \v 1 Omki taam wadnikesi roki,yapu kana omoro nim doo hape farkum,yame omki pem yapu Galilea omki Yeisi pem enou omoro ropokim. \v 2 Yeisi pem yoyim enem waspahgi foyapenkum doo hepe yame omoro. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\c 2 \v 1 Omki taam wadnikesi roki, yapu kana omoro nim doo hape farkum, yame omki pem yapu Galilea omki Yeisi pem enou omoro ropokim. \v 2 Yeisi pem yoyim enem waspahgi foyapenkum doo hepe yame omoro. \ No newline at end of file diff --git a/02/09.txt b/02/09.txt index 6be48b3..90e7e25 100644 --- a/02/09.txt +++ b/02/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Omki yame toom nim yeep ahm omoro, omki anggur ahm arkum omki om yirari ine tamki hapnapar,omki bapurep ohm batma yanap enok yiriam,omki nim om, do hepe farkum foyapum, \v 10 omki uraro fohmum,"yanap waspaki anggur ohm baidnos raki womkin,amsekin tain ohm naimapu yupuru taski yorirae, tanampip wonaki uirabaid. Amsekim anggur ohm naimapu waam baria. -======= -\v 9 Omki yame toom nim yeep ahm omoro,omki anggur ahm arkum omki om yirari ine tamki hapnapar,omki bapurep ohm batma yanap enok yiriam,omki nim om,do hepe farkum foyapum, \v 10 omki uraro fohmum,"yanap waspaki anggur ohm baidnos raki womkin,amsekin tain ohm naimapu yupuru taski yorirae,tanampip wonaki uirabaid.Amsekim anggur ohm naimapu waam baria. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 9 Omki yame toom nim yeep ahm omoro,omki anggur ahm arkum omki om yirari ine tamki hapnapar,omki bapurep ohm batma yanap enok yiriam,omki nim om,do hepe farkum foyapum, \v 10 omki uraro fohmum,"yanap waspaki anggur ohm baidnos raki womkin,amsekin tain ohm naimapu yupuru taski yorirae,tanampip wonaki uirabaid.Amsekim anggur ohm naimapu waam baria. \ No newline at end of file diff --git a/02/11.txt b/02/11.txt index 6b04103..bedf744 100644 --- a/02/11.txt +++ b/02/11.txt @@ -1,8 +1,3 @@ -<<<<<<< HEAD \v 11 Roh naimap om Yeisi omre fomum, yapu Kana omki pem yapu Galilea, saphoyap yeraraam,omki yoyim enem yirapsepe raam omki firkim Yeisi omoro. \p -Yeisi Yapu Kapernaun Omoro -======= -\v 11 Roh naimap om Yeisi omre fomum,yapu Kana omki pem yapu Galilea,saphoyap yeraraam,omki yoyim enem yirapsepe raam omki firkim Yeisi omoro. -(Yeisi Yapu Kapernaun Omoro) ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +Yeisi Yapu Kapernaun Omoro \ No newline at end of file diff --git a/02/12.txt b/02/12.txt index 7d12010..61e8000 100644 --- a/02/12.txt +++ b/02/12.txt @@ -1,8 +1,3 @@ -<<<<<<< HEAD \v 12 Omoro waspaki frasemaim, omki yapu Kapernaum omoro yemaim Yeisi pem enou omki peem yanap enem peem yoyim Yeisi enem,omki omoro tam biap ine toiskisamminkum. \p - Yeisi Wou Tapur Yasep kaap Kaa Fepefarkum -======= -\v 12 Omoro waspaki frasemaim,omki yapu Kapernaum omoro yemaim Yeisi pem enou omki peem yanap enem peem yoyim Yeisi enem,omki omoro tam biap ine toiskisamminkum. -(Yeisi Wou Tapur Yasep kaap Kaa Fepefarkum) ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 + Yeisi Wou Tapur Yasep kaap Kaa Fepefarkum \ No newline at end of file diff --git a/02/13.txt b/02/13.txt index 21824e0..16bb71b 100644 --- a/02/13.txt +++ b/02/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Omki taam tapur Yahudi yonoppon yirap taaim Yeisi omki semaim yapu Yerusalem omoro. \v 14 Wou tapun eper yasap omoro Yeisi tupsadne pedagang-pedagang lembu,kambing domba,pem supaam mumur/home, omki pem haap yuku iyem weyem woutapur kaap omoro. -======= -\v 13 Omki taam tapur Yahudi yonoppon yirap taaim Yeisi omki semaim yapu Yerusalem omoro. \v 14 Wou tapun eper yasap omoro Yeisi tupsadne pedagang-pedagang lembu,kambing domba,pem supaam mumur/home,omki pem haap yuku iyem weyem woutapur kaap omoro. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 13 Omki taam tapur Yahudi yonoppon yirap taaim Yeisi omki semaim yapu Yerusalem omoro. \v 14 Wou tapun eper yasap omoro Yeisi tupsadne pedagang-pedagang lembu,kambing domba,pem supaam mumur/home, omki pem haap yuku iyem weyem woutapur kaap omoro. \ No newline at end of file diff --git a/02/15.txt b/02/15.txt index aad5c26..c51d06b 100644 --- a/02/15.txt +++ b/02/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Omki Yeisi hanip yoonop haroh yasep, forkum bari waniki farkum saiakom enkem, wakum, supam, omki pem haap yeepu iyim wiyem haap enekem waspaki bekepiam wum koseme Yeisi omere omki pem harip haap hatepe yasap waspaki parpir arkum Yeisi omre. \v 16 Omki Yeisi omre tomum supam mumur sasa yanapro fahmum waspaki am hepam, am wou eper aiaro fare yasap wou alam pamipmam. -======= -\v 15 Omki Yeisi hanip yoonop haroh yasep,forkum bari waniki farkum saiakom enkem,wakum,supam,omki pem haap yeepu iyim wiyem haap enekem waspaki bekepiam wum koseme Yeisi omere omki pem harip haap hatepe yasap waspaki parpir arkum Yeisi omre. \v 16 Omki Yeisi omre tomum supam mumur sasa yanapro fahmum waspaki am hepam,am wou eper aiaro fare yasap wou alam pamipmam. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 15 Omki Yeisi hanip yoonop haroh yasep, forkum bari waniki farkum saiakom enkem, wakum, supam, omki pem haap yeepu iyim wiyem haap enekem waspaki bekepiam wum koseme Yeisi omere omki pem harip haap hatepe yasap waspaki parpir arkum Yeisi omre. \v 16 Omki Yeisi omre tomum supam mumur sasa yanapro fahmum waspaki am hepam, am wou eper aiaro fare yasap wou alam pamipmam. \ No newline at end of file diff --git a/02/20.txt b/02/20.txt index 5714dbd..244f330 100644 --- a/02/20.txt +++ b/02/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Omki Yahudi yanap fenkum Yeisi omoro:Omki Yahudi yanap 46 peipa/takun bait tariam, pee ahre taam wadkeski em?" \v 21 Pre roh om akisore fohmum wou aiom om warom enem fakir. \v 22 Warom enem taam watkesi ai roki wapina remteipum.Omki yoyim enem hapyose wonaki frikum, yeram fomin, omki en yirapsem saim yeram roh boup Yeisi enem fomim om. -======= -\v 20 Omki Yahudi yanap fenkum Yeisi omoro:Omki Yahudi yanap 46 peipa/takun bait tariam,pee ahre taam wadkeski em?" \v 21 Pre roh om akisore fohmum wou aiom om warom enem fakir. \v 22 Warom enem taam watkesi ai roki wapina remteipum.Omki yoyim enem hapyose wonaki frikum,yeram fomin,omki en yirapsem saim yeram roh boup Yeisi enem fomim om. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 20 Omki Yahudi yanap fenkum Yeisi omoro:Omki Yahudi yanap 46 peipa/takun bait tariam, pee ahre taam wadkeski em?" \v 21 Pre roh om akisore fohmum wou aiom om warom enem fakir. \v 22 Warom enem taam watkesi ai roki wapina remteipum.Omki yoyim enem hapyose wonaki frikum, yeram fomin, omki en yirapsem saim yeram roh boup Yeisi enem fomim om. \ No newline at end of file diff --git a/03/01.txt b/03/01.txt index 738f687..f55e068 100644 --- a/03/01.txt +++ b/03/01.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD \c 3 Fopo Uraroh Menma -\p \v 1 Amro, pahmo nim Farisi yap naenem, Nikodemus, omamar pemimpin bangsa Yahudi yap. \v 2 Isi Pahmo omhom yeisi ahro amki fohmum; rabi, depyiran ah om guru om woki haim ar ahki, omor ine yanap pahmakin, frare tanda tanda naimap omor paski ahre fronom, omor er=nem af ahre, omoro wassirangi." -======= -\c 3 (Fopo Uraroh Menma) \v 1 Amro, pahmo nim Farisi yap naenem, Nikodemus, omamar pemimpin bangsa Yahudi yap. \v 2 Isi Pahmo omhom yeisi ahro amki fohmum; rabi, depyiran ah om guru om woki haim ar ahki, omor ine yanap pahmakin, frare tanda tanda naimap omor paski ahre fronom, omor er=nem af ahre, omoro wassirangi." ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\p \v 1 Amro, pahmo nim Farisi yap naenem, Nikodemus, omamar pemimpin bangsa Yahudi yap. \v 2 Isi Pahmo omhom yeisi ahro amki fohmum; rabi, depyiran ah om guru om woki haim ar ahki, omor ine yanap pahmakin, frare tanda tanda naimap omor paski ahre fronom, omor er=nem af ahre, omoro wassirangi." \ No newline at end of file diff --git a/03/19.txt b/03/19.txt index 164bea3..037410f 100644 --- a/03/19.txt +++ b/03/19.txt @@ -1,7 +1,3 @@ \v 19 Amar hukum an; upmaskiweime houm bep amroh pe yanap am ipopke isi kapro ohou, umaski om ine omor beheme om en fitn om tanam. \v 20 Omor yanap yanap akin frare enkem tanam henma upmaski amro pem ine inima upmas kiomro amki omro frare enekem ine ura piupose ura. \v 21 Amar omki, yanape om frare yeraram yar om sepe umaski amro omki fare fakir frare yap enem am amki waski frare faker waina ar ahro." -<<<<<<< HEAD \p -Yohanes Sapnim Ama Yeisi Ahin Farir -======= -(Yohanes Sapnim Ama Yeisi Ahin Farir) ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +Yohanes Sapnim Ama Yeisi Ahin Farir \ No newline at end of file diff --git a/manifest.json b/manifest.json index aaeaea9..966baaa 100644 --- a/manifest.json +++ b/manifest.json @@ -40,6 +40,7 @@ "finished_chunks": [ "front-title", "01-title", + "01-01", "01-04", "01-06", "01-09",