From 59ad03c7cb2771178976ea5aed8bdea9a8e74096 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Wed, 19 Feb 2020 08:13:39 +0700 Subject: [PATCH] Wed Feb 19 2020 08:13:39 GMT+0700 (Tomsk Standard Time) --- 01/09.txt | 6 +----- 02/01.txt | 6 +----- 02/title.txt | 6 +----- 03/01.txt | 6 +----- 03/title.txt | 6 +----- manifest.json | 9 +++++++-- 6 files changed, 12 insertions(+), 27 deletions(-) diff --git a/01/09.txt b/01/09.txt index e303833..9c5a591 100644 --- a/01/09.txt +++ b/01/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 -======= -\v 9 Iini kudi ue ila omi angu e jeing e meng angu ateing harak. iini Lahatala apang adang , bot e huring e jara angu iola e paleteng. \v 10 Taang mi ana hoa e ma , e nehe hamulang kadulang ang naung ot Aing tajaning. bot neheba iomi metma aing veng anamang ila angu naung iomi metma iang veng ravak sehi e vengbanang hula aungba ni metma veng imaring angu iini iomi metma venganamang ila. ->>>>>>> 4a714ad23a207ca873028d7a1965800c14bb5a4d +\v 9 Iini kudi ue ila omi angu e jeing e meng angu ateing harak. iini Lahatala apang adang , bot e huring e jara angu iola e paleteng. \v 10 Taang mi ana hoa e ma , e nehe hamulang kadulang ang naung ot Aing tajaning. bot neheba iomi metma aing veng anamang ila angu naung iomi metma iang veng ravak sehi e vengbanang hula aungba ni metma veng imaring angu iini iomi metma venganamang ila. \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index d18dc28..052eb6b 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Kaku naung serang naung, pi mutu Yesus Kristus Ana hoa se Ana ping metma Aing veng anung nu kolang. \v 2 Aulang e iini eke iava vai ekang bot vengukur iava manasal misavaka ni karatasiva hur kokal ma mi hurak niang he mang vomung metma ienang hula; Lahatala e Roh hamulang e ved ue hoa. -======= -\c 2 MANUSIA JASI UE HOA \v 1 Kaku naung serang naung, pi mutu Yesus Kristus Ana hoa se Ana ping metma Aing veng anung nu kolang. \v 2 Aulang e iini eke iava vai ekang bot vengukur iava manasal misavaka ni karatasiva hur kokal ma mi hurak niang he mang vomung metma ienang hula; Lahatala e Roh hamulang e ved ue hoa. ->>>>>>> 4a714ad23a207ca873028d7a1965800c14bb5a4d +\c 2 MANUSIA JASI UE HOA \v 1 Kaku naung serang naung, pi mutu Yesus Kristus Ana hoa se Ana ping metma Aing veng anung nu kolang. \v 2 Aulang e iini eke iava vai ekang bot vengukur iava manasal misavaka ni karatasiva hur kokal ma mi hurak niang he mang vomung metma ienang hula; Lahatala e Roh hamulang e ved ue hoa. \ No newline at end of file diff --git a/02/title.txt b/02/title.txt index 8b5cae3..bf783de 100644 --- a/02/title.txt +++ b/02/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Pasal 2 -======= -PASAL 2 ->>>>>>> 4a714ad23a207ca873028d7a1965800c14bb5a4d +Pasal 2 \ No newline at end of file diff --git a/03/01.txt b/03/01.txt index 99096d8..ed3ce58 100644 --- a/03/01.txt +++ b/03/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 E vengabang, ne kaku nea serang, banang senang aulang he Lahatala ene angu alilit denaveng denaveng bot Aing tajani emenghula ue iabung angu. \v 2 Bot aulang e mitahi tila ne jasi ne ahala angu bot ing ipimi angu iomi anamang angu bae iabung niang. \v 3 Arunge Lahatala angu omi bisa Ana Kuat daeri bot ping metma jasi angu eola e paleter. -======= -\c 3 PAULUS E BANANG E SENANG \v 1 E vengabang, ne kaku nea serang, banang senang aulang he Lahatala ene angu alilit denaveng denaveng bot Aing tajani emenghula ue iabung angu. \v 2 Bot aulang e mitahi tila ne jasi ne ahala angu bot ing ipimi angu iomi anamang angu bae iabung niang. \v 3 Arunge Lahatala angu omi bisa Ana Kuat daeri bot ping metma jasi angu eola e paleter. ->>>>>>> 4a714ad23a207ca873028d7a1965800c14bb5a4d +\c 3 PAULUS E BANANG E SENANG \v 1 E vengabang, ne kaku nea serang, banang senang aulang he Lahatala ene angu alilit denaveng denaveng bot Aing tajani emenghula ue iabung angu. \v 2 Bot aulang e mitahi tila ne jasi ne ahala angu bot ing ipimi angu iomi anamang angu bae iabung niang. \v 3 Arunge Lahatala angu omi bisa Ana Kuat daeri bot ping metma jasi angu eola e paleter. \ No newline at end of file diff --git a/03/title.txt b/03/title.txt index 6b4b72d..c39f784 100644 --- a/03/title.txt +++ b/03/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Pasal 3 -======= -PASAL 3 ->>>>>>> 4a714ad23a207ca873028d7a1965800c14bb5a4d +Pasal 3 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 21f61d1..8e19fc6 100644 --- a/manifest.json +++ b/manifest.json @@ -39,15 +39,20 @@ "finished_chunks": [ "01-03", "01-06", + "01-09", + "01-11", + "02-title", + "02-01", "02-03", "02-05", "02-08", "02-11", "02-13", "02-16", + "03-title", + "03-01", "03-06", "03-10", - "03-16", - "01-11" + "03-16" ] } \ No newline at end of file