From 65af1ed2530a153f911b494cf820b1e20eca4107 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Wed, 19 Feb 2020 08:16:05 +0700 Subject: [PATCH] Wed Feb 19 2020 08:16:04 GMT+0700 (Tomsk Standard Time) --- 01/01.txt | 6 +----- 01/title.txt | 6 +----- front/title.txt | 6 +----- manifest.json | 3 +++ 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/01/01.txt b/01/01.txt index 51a4df7..a975de7 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 ADA HAROMAT METMA JEMAAT TESALONIKA IE NANG Ada haromat Timang Lahatala ,bot Yesus Kristus omimi, naing ba Paulus, Silwanus bot Timatius, ni metma jemaat ba poe Tesalonika abang mi angu ipanatu. \v 2 Aung hama, mona majalung ba ue Timang Lahatala, bot Yesus Kristus abang angu mi metma mainang. -======= -\c 1 \v 1 ADA HAROMAT METMA JEMAAT TESALONIKA IE NANG Ada haromat Timang Lahatala ,bot Yesus Kristus omimi, naing ba Paulus, Silwanus bot Timatius, ni metma jemaat ba poe Tesalonika abang mi angu ipanatu. \v 2 Aung hama, mona majalung ba ue Timang Lahatala, bot Yesus Kristus abang angu mi metma mainang. ->>>>>>> 4a714ad23a207ca873028d7a1965800c14bb5a4d +\c 1 ADA HAROMAT METMA JEMAAT TESALONIKA IE NANG \v 1 Ada haromat Timang Lahatala ,bot Yesus Kristus omimi, naing ba Paulus, Silwanus bot Timatius, ni metma jemaat ba poe Tesalonika abang mi angu ipanatu. \v 2 Aung hama, mona majalung ba ue Timang Lahatala, bot Yesus Kristus abang angu mi metma mainang. \ No newline at end of file diff --git a/01/title.txt b/01/title.txt index 77d3ccf..bf783de 100644 --- a/01/title.txt +++ b/01/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Pasal 2 -======= -PAULUS E SURAT E MI ARU ANA METMA JEMAAT TESALONIKA E PANATU E ONG NU ->>>>>>> 4a714ad23a207ca873028d7a1965800c14bb5a4d +Pasal 2 \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index 8625c83..cd7aa30 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -2 Thessalonians -======= -TESALONIKA ->>>>>>> 4a714ad23a207ca873028d7a1965800c14bb5a4d +TESALONIKA \ No newline at end of file diff --git a/manifest.json b/manifest.json index b33e3bb..8e6f58c 100644 --- a/manifest.json +++ b/manifest.json @@ -37,6 +37,9 @@ "BLAGAR" ], "finished_chunks": [ + "front-title", + "01-title", + "01-01", "01-03", "01-06", "01-09",