From 735850f0d28668748f6d228f5ee8f94b80c221d5 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Mon, 26 Jun 2023 21:42:38 +0900 Subject: [PATCH] Mon Jun 26 2023 21:42:37 GMT+0900 (Eastern Indonesia Time) --- 01/01.txt | 6 +----- manifest.json | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/01/01.txt b/01/01.txt index ef24836..00d88ef 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Paulus te simisiki, Yesus Kristus kena walriysu kena kembalri, Mang Walri kena A eine. \v 2 Walri yau eine detelro Korintus yone, Kristus kena eine skumupukona, simipuko mlro-mlro detelronembeiye walri yau metelrena nouna eyei Tuhan Yesus kristus pelre simaina nenei noune nepelre eyeine. \v 3 wekotena Yambu Walri , teme poi, Mang Walri eyei memay Tuhan Yesus Kristus. Paulus Mang Walri A Sani-sani Eine -======= -\c 1 (Paulus kena semo memtetelretena Korintuste Walri yau nelrotenate melropuko) \v 1 Pauluste simisiku,Yesus Kristus kna walri yau kembalri,Mang Wali kena a eine. \v 2 Walri yau Eina petelro Korintus yome. Kristus kna eine skumufukona.simifuko mromro detelro,nembei ye walri yau metelrena nou na,Eyei Tuhan Yesus Kristus pelre simaina. Nenai nou ne nepelre Eyeine. \v 3 Wekdena yambu walri,teme poi mengwalri Eyei memai nepelre Tuhan Yesus Kristus. ->>>>>>> 675d75b36ca70c388d70400e7a7421ca509760c8 +\c 1 Paulus kena semo memetelretena Korintuste Walri yau nelrotenate melropuko \v 1 Pauluste simisiku,Yesus Kristus kna walri yau kembalri,Mang Wali kena a eine. \v 2 Walri yau Eina petelro Korintus yome. Kristus kna eine skumufukona.simifuko mromro detelro,nembei ye walri yau metelrena nou na,Eyei Tuhan Yesus Kristus pelre simaina. Nenai nou ne nepelre Eyeine. \v 3 Wekdena yambu walri,teme poi mengwalri Eyei memai nepelre Tuhan Yesus Kristus. \ No newline at end of file diff --git a/manifest.json b/manifest.json index b0e0b37..a1d2d88 100644 --- a/manifest.json +++ b/manifest.json @@ -40,6 +40,7 @@ "finished_chunks": [ "front-title", "01-title", + "01-01", "01-12", "01-14", "01-17",