From 1d10e03ed6fd26b647094c7b17098535a683a6b4 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Sun, 17 Mar 2019 18:53:24 +0700 Subject: [PATCH] Sun Mar 17 2019 18:53:24 GMT+0700 (SE Asia Standard Time) --- 19/title.txt | 1 + 20/01.txt | 10 ++-------- 20/04.txt | 11 ++--------- 22/title.txt | 1 + manifest.json | 4 ++++ 5 files changed, 10 insertions(+), 17 deletions(-) create mode 100644 19/title.txt create mode 100644 22/title.txt diff --git a/19/title.txt b/19/title.txt new file mode 100644 index 00000000..da673088 --- /dev/null +++ b/19/title.txt @@ -0,0 +1 @@ +Pasal 19 \ No newline at end of file diff --git a/20/01.txt b/20/01.txt index 2c8379db..9f1675d9 100644 --- a/20/01.txt +++ b/20/01.txt @@ -1,9 +1,3 @@ -<<<<<<< HEAD -PAULUS KA NAGARI MAKEDONIA BA +\c 20 PAULUS KA NAGARI MAKEDONIA BA NAGARI YUNANI -\v 1 Ako ba parang koo, Paulus ngundang murit-murite, ako' ngoatot ati ne' ido', io babatak ka ne' ido' lalu ampus ka Makedonia. \v 2 Ako' io nyarohi binuo-binuo di koo lalu mare ne' ido' pituo, io sampe ka Yunani.\v 3 Di naun Paulus diop talu buotn. Karamo urokng-urokng Yahudi ba pakat sa' malawano' io waktu io ba layaro' ka Siria, io ba pikir muokngo' tomokng lewat Makedonia agi'. -======= -PAULUS KA NAGARI MAKEDONIA BA NAGARI YUNANI - -\v 1 Dah ako karusuhot koo, Paulus ngundang moredte, ngoatot ati ne'ido', ako koo io pamet ka ne'ido' ampos'o ka Makedonia. \v 2 Io sampe ka Yunani ba marekso daerah koo manyak mare naseht ka ne'ido'. \v 3 Salamo 3 buot Paulus diop dinaan. Pas io mao balayar ka Siria, io motosot onto muok lewat Makedonia Karano urokng-urokng Yahudi bapakat onto ngalawano io. ->>>>>>> f336277e3ac8b7a08cf731d451b9c04ca4dc852d + \v 1 Ako ba parang koo, Paulus ngundang murit-murite, ako' ngoatot ati ne' ido', io babatak ka ne' ido' lalu ampus ka Makedonia. \v 2 Ako' io nyarohi binuo-binuo di koo lalu mare ne' ido' pituo, io sampe ka Yunani. \v 3 Di naun Paulus diop talu buotn. Karamo urokng-urokng Yahudi ba pakat sa' malawano' io waktu io ba layaro' ka Siria, io ba pikir muokngo' tomokng lewat Makedonia agi'. \ No newline at end of file diff --git a/20/04.txt b/20/04.txt index b707118b..6697f2c5 100644 --- a/20/04.txt +++ b/20/04.txt @@ -1,9 +1,2 @@ -<<<<<<< HEAD -\v 4 Ayuk Paulus sopater ampat ka Berea, anak Pirus, Aristarkhus ba Sekundus, ampat ka Tesalonika, ba Gayus ampat ka Derbe, ba Timotius, Tikhikus ba Trofimus ampat ka Asia. \v 5 Ne' ido' barangkat doho lalu nunggu kami ka Troas, \v 6 tapi kami ba layar ampat ka Filifi ako Ari rayo Roti No' Baragi, lalu atokng ka ne' ido' ka Troas doop 5 ari, di nau kamu -diop salamo 7 ari. KAATANGANPAULUS NANG PANGABISAN KA KOTO TROAS -======= -\v 4 Paulus dingayuki Sopater dari Berea, anak Pirus, Aristarkhus ba Sekundus, dari Tesalonika, ba Gayus dari Derbe, Timotius, Tikhikus ba Trofimus dari Asia. -\v 5 Ne'ido barangkat doho ngantiot kami di Troas, -\v 6 tapi dah ako Ari Rayo Roti no Baragi, 5 ari baru' kami balayar dari Filipi atok ka ne'ido' di Troas, dinao'n kami diop salamo 7 ari. -PANABOOT PAULUS NANG TARAHER DI KOTA TROAS ->>>>>>> f336277e3ac8b7a08cf731d451b9c04ca4dc852d +\v 4 Ayuk Paulus sopater ampat ka Berea, anak Pirus, Aristarkhus ba Sekundus, ampat ka Tesalonika, ba Gayus ampat ka Derbe, ba Timotius, Tikhikus ba Trofimus ampat ka Asia. \v 5 Ne' ido' barangkat doho lalu nunggu kami ka Troas, \v 6 tapi kami ba layar ampat ka Filifi ako Ari rayo Roti No' Baragi, lalu atokng ka ne' ido' ka Troas doop 5 ari, di nau kamu +diop salamo 7 ari. KAATANGANPAULUS NANG PANGABISAN KA KOTO TROAS \ No newline at end of file diff --git a/22/title.txt b/22/title.txt new file mode 100644 index 00000000..227b28fa --- /dev/null +++ b/22/title.txt @@ -0,0 +1 @@ +Pasal 22 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 2314f33b..7e0e891c 100644 --- a/manifest.json +++ b/manifest.json @@ -238,6 +238,7 @@ "15-33", "15-36", "15-39", + "19-title", "19-01", "19-03", "19-05", @@ -255,6 +256,8 @@ "19-35", "19-38", "20-title", + "20-01", + "20-04", "20-07", "20-09", "20-11", @@ -267,6 +270,7 @@ "20-31", "20-33", "20-36", + "22-title", "22-01", "22-03", "22-06",