From 98791c05bd50ef978d51b71d58442e52830c643d Mon Sep 17 00:00:00 2001 From: "bahasatech.indotengah" Date: Mon, 3 Aug 2020 11:09:17 +0800 Subject: [PATCH] Mon Aug 03 2020 11:09:16 GMT+0800 (Malay Peninsula Standard Time) --- 03/03.txt | 7 +------ 03/05.txt | 7 +------ 03/07.txt | 7 +------ 03/09.txt | 7 +------ 03/11.txt | 7 +------ 03/13.txt | 9 +-------- 03/17.txt | 8 +------- 03/20.txt | 8 +------- 03/23.txt | 8 +------- 03/26.txt | 7 +------ 04/title.txt | 1 + 05/title.txt | 1 + manifest.json | 12 ++++++++++++ 13 files changed, 24 insertions(+), 65 deletions(-) create mode 100644 04/title.txt create mode 100644 05/title.txt diff --git a/03/03.txt b/03/03.txt index d9ce176..3f67408 100644 --- a/03/03.txt +++ b/03/03.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 3 Kua i Yesus a totumu i mateu kamana weta : Ayom, tumod atutud!. -\v 4 Osa kuaNa besilatahula : bisa donatuliden anendo Sabat, tumulid mauleng suma tapia, mawatow suma mate itow. Sumata silatahula batiimetewoho. -======= -\v 3 i Yesus a totumu i mateu kamana weta : Ayom, tumod atutud!. \v 4 kuaNa besilatahula : bisa donatuliden anendo Sabat, tumulid mauleng suma tapia, mawatow suma mate itow. Sumata silatahula batiimetewoho. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 3 i Yesus a totumu i mateu kamana weta : Ayom, tumod atutud!. \v 4 kuaNa besilatahula : bisa donatuliden anendo Sabat, tumulid mauleng suma tapia, mawatow suma mate itow. Sumata silatahula batiimetewoho. \ No newline at end of file diff --git a/03/05.txt b/03/05.txt index 488942f..0e250d5 100644 --- a/03/05.txt +++ b/03/05.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 5 Sisia matape awahem kanat ilatahula osa Sia moboro milah atumapiri i Sia. Osa Sia kumua atou wiboho iyoyomai kamanu !iyoyamay kamanu imemaulengem. -\v 6 Manga tow Farisi lumuai osa mekodaitau bo totumu Herodian lumimed i Sia. -======= -\v 5 matape awahem kanat ilatahula osa Sia moboro milah atumapiri i Sia. Osa Sia kumua atou wiboho iyoyomai kamanu !iyoyamay kamanu imemaulengem. \v 6 tow Farisi lumuai osa mekodaitau bo totumu Herodian lumimed i Sia. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 5 matape awahem kanat ilatahula osa Sia moboro milah atumapiri i Sia. Osa Sia kumua atou wiboho iyoyomai kamanu !iyoyamay kamanu imemaulengem. \v 6 tow Farisi lumuai osa mekodaitau bo totumu Herodian lumimed i Sia. \ No newline at end of file diff --git a/03/07.txt b/03/07.txt index f7399cb..02e10f2 100644 --- a/03/07.txt +++ b/03/07.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 7 Ahadiayaho si Yesus bo murit-muritNa menu aluah, bo tadoo totumu i Galilea lumas i Sia, osa a Yudea, -\v 8 A Yerusalem, a Idumea, a tetela Yordan, bo asakum Tirus, bo Sidon tadoo totumu moay be Sia, ahadiaho silatahula tumanga pahasa tinulidNa. -======= -\v 7 si Yesus bo murit-muritNa menu aluah, bo tadoo totumu i Galilea lumas i Sia, osa a Yudea, \v 8 Yerusalem, a Idumea, a tetela Yordan, bo asakum Tirus, bo Sidon tadoo totumu moay be Sia, ahadiaho silatahula tumanga pahasa tinulidNa. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 7 si Yesus bo murit-muritNa menu aluah, bo tadoo totumu i Galilea lumas i Sia, osa a Yudea, \v 8 Yerusalem, a Idumea, a tetela Yordan, bo asakum Tirus, bo Sidon tadoo totumu moay be Sia, ahadiaho silatahula tumanga pahasa tinulidNa. \ No newline at end of file diff --git a/03/09.txt b/03/09.txt index 83d9b33..64b4b3b 100644 --- a/03/09.txt +++ b/03/09.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 9 Sumadia esa bolutu tanu si Sia nde tadoo totumu, samiboho silatahula ahii moho kumuwit i Sia. -\v 10 Kawalianiaho si Sia i mamauleng i tadoo totumu, saniboho pahasa makelam mahados mepewasatau be Sia osa tumaka be Sia. -======= -\v 9 esa bolutu tanu si Sia nde tadoo totumu, samiboho silatahula ahii moho kumuwit i Sia. \v 10 si Sia i mamauleng i tadoo totumu, saniboho pahasa makelam mahados mepewasatau be Sia osa tumaka be Sia. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 9 esa bolutu tanu si Sia nde tadoo totumu, samiboho silatahula ahii moho kumuwit i Sia. \v 10 si Sia i mamauleng i tadoo totumu, saniboho pahasa makelam mahados mepewasatau be Sia osa tumaka be Sia. \ No newline at end of file diff --git a/03/11.txt b/03/11.txt index 557efc7..13a3716 100644 --- a/03/11.txt +++ b/03/11.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 11 Samanga tutuh tapia melilah i Sia, silatahula hatia osa ha salimbuhu a sasaangeNa osa mawasawang : Sihow bata i Ningumeled. -\v 12 Sumata Sia a kahetehana merow silatula kumua sisei sia. -======= -\v 11 tutuh tapia melilah i Sia, silatahula hatia osa ha salimbuhu a sasaangeNa osa mawasawang : Sihow bata i Ningumeled. \v 12 Sia a kahetehana merow silatula kumua sisei sia. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 11 tutuh tapia melilah i Sia, silatahula hatia osa ha salimbuhu a sasaangeNa osa mawasawang : Sihow bata i Ningumeled. \v 12 Sia a kahetehana merow silatula kumua sisei sia. \ No newline at end of file diff --git a/03/13.txt b/03/13.txt index 78287be..4673e98 100644 --- a/03/13.txt +++ b/03/13.txt @@ -1,8 +1 @@ -<<<<<<< HEAD -\v 13 Ahadiaho si Yesus kumapet andungusan. Si Sia tumiang manga totumu i wetenaanNa bo silatahula moay be Sia. -\v 14 Si Sia tumantu sangawulu borua totumu lumas be Sia nde iwasiuNa kumua i kukua. -\v 15 Bo bineaNa kawasa meley i kanalu. -\v 16 Sangawulu borua tatumu tinantuNa a wai : Si Simon beweangalaNa Petrus. -======= -\v 13 si Yesus kumapet andungusan. Si Sia tumiang manga totumu i wetenaanNa bo silatahula moay be Sia. \v 14 Sia tumantu sangawulu borua totumu lumas be Sia nde iwasiuNa kumua i kukua. \v 15 bineaNa kawasa meley i kanalu. \v 16 borua tatumu tinantuNa a wai : Si Simon beweangalaNa Petrus. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 13 si Yesus kumapet andungusan. Si Sia tumiang manga totumu i wetenaanNa bo silatahula moay be Sia. \v 14 Sia tumantu sangawulu borua totumu lumas be Sia nde iwasiuNa kumua i kukua. \v 15 bineaNa kawasa meley i kanalu. \v 16 borua tatumu tinantuNa a wai : Si Simon beweangalaNa Petrus. \ No newline at end of file diff --git a/03/17.txt b/03/17.txt index 60701f5..476bf5e 100644 --- a/03/17.txt +++ b/03/17.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 17 Yakobus bata i Zebedeus, bo Yohanes pog i Yakobus, osa silandua binea-Na ngalau Boanerges. Besondait mangahendong korohu. -\v 18 A kalawusan si Andreas, Filipus, Bartolomeus, Matius, Tomas, Yakobus bata i Alfeus, Tadeus, -\v 19 Bo si Yudas Iskariot itumalihud i Sia. -======= -\v 17 bata i Zebedeus, bo Yohanes pog i Yakobus, osa silandua binea-Na ngalau Boanerges. Besondait mangahendong korohu. \v 18 kalawusan si Andreas, Filipus, Bartolomeus, Matius, Tomas, Yakobus bata i Alfeus, Tadeus, \v 19 si Yudas Iskariot itumalihud i Sia. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 17 bata i Zebedeus, bo Yohanes pog i Yakobus, osa silandua binea-Na ngalau Boanerges. Besondait mangahendong korohu. \v 18 kalawusan si Andreas, Filipus, Bartolomeus, Matius, Tomas, Yakobus bata i Alfeus, Tadeus, \v 19 si Yudas Iskariot itumalihud i Sia. \ No newline at end of file diff --git a/03/20.txt b/03/20.txt index e7ac6ea..b0c91c4 100644 --- a/03/20.txt +++ b/03/20.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 20 Ahadiaho si Yesus sumuang a esa bale. Osa moay tatumu tadoo sumesen noay, kawalian kumapê silatahula ahii matâu. -\v 21 Tepo i sanganah-Na makatâan i’aho, silatahula morai minjo i Sia, awahem kua ilatahula si Sia ahi’i moho wu’tul. -\v 22 Osa pata’asen i Taurat i moay a Yerusalem kumua : “Si Sia pinongaluman i Belsebul “bo karengan pahalasen i sumesenggot. Si Sia mahelei i sumenggot. -======= -\v 20 si Yesus sumuang a esa bale. Osa moay tatumu tadoo sumesen noay, kawalian kumapê silatahula ahii matâu. \v 21 i sanganah-Na makatâan i’aho, silatahula morai minjo i Sia, awahem kua ilatahula si Sia ahi’i moho wu’tul. \v 22 pata’asen i Taurat i moay a Yerusalem kumua : “Si Sia pinongaluman i Belsebul “bo karengan pahalasen i sumesenggot. Si Sia mahelei i sumenggot. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 20 si Yesus sumuang a esa bale. Osa moay tatumu tadoo sumesen noay, kawalian kumapê silatahula ahii matâu. \v 21 i sanganah-Na makatâan i’aho, silatahula morai minjo i Sia, awahem kua ilatahula si Sia ahi’i moho wu’tul. \v 22 pata’asen i Taurat i moay a Yerusalem kumua : “Si Sia pinongaluman i Belsebul “bo karengan pahalasen i sumesenggot. Si Sia mahelei i sumenggot. \ No newline at end of file diff --git a/03/23.txt b/03/23.txt index 06faedb..1f9bb4c 100644 --- a/03/23.txt +++ b/03/23.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 23 Si Yesus i’tumiang silatahula, osa kumua besilatahula pangandean kelembisa sumesenggot dona meley sumesenggot? -\v 24 Sa esa pakolanoan materi-teri, pakolanoan ahi’i haenet, -\v 25 Bohahi êsa pamalean materi-materi, pamalean niaho ahi’i haânet. -======= -\v 23 Yesus i’tumiang silatahula, osa kumua besilatahula pangandean kelembisa sumesenggot dona meley sumesenggot? \v 24 esa pakolanoan materi-teri, pakolanoan ahi’i haenet, \v 25 êsa pamalean materi-materi, pamalean niaho ahi’i haânet. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 23 Yesus i’tumiang silatahula, osa kumua besilatahula pangandean kelembisa sumesenggot dona meley sumesenggot? \v 24 esa pakolanoan materi-teri, pakolanoan ahi’i haenet, \v 25 êsa pamalean materi-materi, pamalean niaho ahi’i haânet. \ No newline at end of file diff --git a/03/26.txt b/03/26.txt index def9dc2..b1efb63 100644 --- a/03/26.txt +++ b/03/26.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 26 Keleahohahi sa sumesenggot sa monganus sumaang i’batangana mio bo sia materi-teri sisia hi’i haênêt sumata motahademio biboho. -\v 27 Sumata ahemai totumu dona sumuang imbale itow morowot kumandet i’mangagogaidana satahi’i sagotenawe etotumu morowot iaho. Ahaidiaho dona sia manaharow ambale iaho. -======= -\v 26 sa sumesenggot sa monganus sumaang i’batangana mio bo sia materi-teri sisia hi’i haênêt sumata motahademio biboho. \v 27 ahemai totumu dona sumuang imbale itow morowot kumandet i’mangagogaidana satahi’i sagotenawe etotumu morowot iaho. Ahaidiaho dona sia manaharow ambale iaho. ->>>>>>> e653e5410416e0e95c2562f2e49f6ba9e763737e +\v 26 sa sumesenggot sa monganus sumaang i’batangana mio bo sia materi-teri sisia hi’i haênêt sumata motahademio biboho. \v 27 ahemai totumu dona sumuang imbale itow morowot kumandet i’mangagogaidana satahi’i sagotenawe etotumu morowot iaho. Ahaidiaho dona sia manaharow ambale iaho. \ No newline at end of file diff --git a/04/title.txt b/04/title.txt new file mode 100644 index 0000000..dc7a32d --- /dev/null +++ b/04/title.txt @@ -0,0 +1 @@ +Pasal 4 \ No newline at end of file diff --git a/05/title.txt b/05/title.txt new file mode 100644 index 0000000..df52e2b --- /dev/null +++ b/05/title.txt @@ -0,0 +1 @@ +Pasal 5 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 2dc0607..1b5a8d1 100644 --- a/manifest.json +++ b/manifest.json @@ -81,9 +81,21 @@ "02-25", "02-27", "03-title", + "03-01", + "03-03", + "03-05", + "03-07", + "03-09", + "03-11", + "03-13", + "03-17", + "03-20", + "03-23", + "03-26", "03-28", "03-31", "03-33", + "04-title", "04-01", "04-03", "04-06",