From 92f6db30976cf7190733ab993ad64e3fbc29c4d5 Mon Sep 17 00:00:00 2001 From: "bahasatech.indotengah" Date: Wed, 24 May 2023 09:18:08 +0700 Subject: [PATCH] Wed May 24 2023 09:18:07 GMT+0700 (Indochina Time) --- 01/01.txt | 6 +----- 01/04.txt | 6 +----- manifest.json | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/01/01.txt b/01/01.txt index 2558079..0e00b37 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 Salam wali ti Paulusa \v 1 Wali ti Paulussa nimma dadi Rasulla Yesu Kristu pa wukkunnai Alla,dangngu wali ti Timotius oli dadi seimanda yitta. \v 2 Kepada tu kudus dangngu olidadi seimanda ma setia ti dalu Yesu Kristu ti Kolose. Ni Anugramu dangngu ni damai sejahtera nimma wali ti Allah Amanda.Nisambaya dangngu ni ucapan syukur Paulus. \v 3 Banna sambaya nitutumu,yami selaalu mengucap syukur ti Allah, ni Amannai Muri Yesu Kristu, -======= -\c 1 Salam wali ti Paulusa \v 1 Wali ti Paulussa nimma dadi Rasulla Yesu Kristu pa wukkunnai Alla,dangngu wali ti Timotius oli dadi seimanda yitta. \v 2 Kepada tu kudus dangngu olidadi seimanda ma setia ti dalu Yesu Kristu ti Kolose.Ni Anugramu dangngu ni damai sejahtera nimma wali ti Alla Amanda.Nisambaya dangngu ni ucapan syukur Paulus. \v 3 Banna sambaya nitutumu,yami selaalu mengucap syukur ti Alla, ni Amannai Muri Yesu Kristu, ->>>>>>> 01bc1c4f9570dceefa9c7092c6fb589bc51c8f6b +\c 1 Salam wali ti Paulusa \v 1 Wali ti Paulussa nimma dadi Rasulla Yesu Kristu pa wukkunnai Alla,dangngu wali ti Timotius oli dadi seimanda yitta. \v 2 Kepada tu kudus dangngu olidadi seimanda ma setia ti dalu Yesu Kristu ti Kolose. Ni Anugramu dangngu ni damai sejahtera nimma wali ti Allah Amanda.Nisambaya dangngu ni ucapan syukur Paulus. \v 3 Banna sambaya nitutumu,yami selaalu mengucap syukur ti Allah, ni Amannai Muri Yesu Kristu, \ No newline at end of file diff --git a/01/04.txt b/01/04.txt index 47b0c49..2f050a4 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Yami marngnginni imanmu ti dalu Yesu Kristu dangngu banna bussanggummi yimmi dangngu ngarandukka dabbadda tu kudus. \v 5 Iman dangngu ni Kasih na sungngai karena nippa harappanda na sadiandai ti surga,nippa badda rangngimmi ti Firman kebenaran yaitu Injil. \v 6 Injil itu badda tomannikka ti yimmi bahkan ngarandukka dabbanni nipannu tana dangngu ni injil terus banna wuai dangngu banna berkembang,samamannuni nimma terjadi ti yimmi,sejak bairangngi dangngu baimangertinggi di Anugra Allah ti dalu kebenaran. -======= -\v 4 Yami marngnginni imanmu ti dalu Yesu Kristu dangngu banna bussanggummi yimmi dangngu ngarandukka dabbadda tu kudus. \v 5 Iman dangngu ni Kasih na sungngai karena nippa harappanda na sadiandai ti surga,nippa badda rangngimmi ti Firman kebenaran yaitu Injil. \v 6 Injil itu badda tomannikka ti yimmi bahkan ngarandukka dabbanni nipannu tana dangngu ni injil terus banna wuai dangngu banna berkembang,samamannuni nimma terjadi ti yimmi,sejak bairangngi dangngu baimangertinggi di Anugra Alla ti dalu kebenaran. ->>>>>>> 01bc1c4f9570dceefa9c7092c6fb589bc51c8f6b +\v 4 Yami marngnginni imanmu ti dalu Yesu Kristu dangngu banna bussanggummi yimmi dangngu ngarandukka dabbadda tu kudus. \v 5 Iman dangngu ni Kasih na sungngai karena nippa harappanda na sadiandai ti surga,nippa badda rangngimmi ti Firman kebenaran yaitu Injil. \v 6 Injil itu badda tomannikka ti yimmi bahkan ngarandukka dabbanni nipannu tana dangngu ni injil terus banna wuai dangngu banna berkembang,samamannuni nimma terjadi ti yimmi,sejak bairangngi dangngu baimangertinggi di Anugra Allah ti dalu kebenaran. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 22b72bc..b3d0618 100644 --- a/manifest.json +++ b/manifest.json @@ -38,6 +38,8 @@ "finished_chunks": [ "front-title", "01-title", + "01-01", + "01-04", "01-07", "01-09", "01-11",