From b74a42037115fe1503b189e8ade28f82ebc28085 Mon Sep 17 00:00:00 2001 From: bakati_rara Date: Thu, 1 Jun 2023 17:00:39 +0700 Subject: [PATCH] Thu Jun 01 2023 17:00:38 GMT+0700 (Indochina Time) --- 08/01.txt | 6 +----- manifest.json | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/08/01.txt b/08/01.txt index 82d6649..c466731 100644 --- a/08/01.txt +++ b/08/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 8 Pangkuman Da Gatn Persembah a' Ka Berhala \v 1 Mati', hal daging-daging da gatn persembah a' ka berhala-berhala. Ite pane bahwa ite samaan umpu pengetahuan. Pengetahuan umas sombong, tatapi kasih membangun. \v 2 Jika ani sok da ngira bahwa ni' pane jai hal, ni' tinga panane da sa harus a' ni' pane. \v 3 Namun, jika ani sok da mengasihi Jabata, ni' gatn kanan yak Jabata. -======= -\v 1 Mati', manganai dagin-dagin da gatn mamparsambah ka barhala-barhala. Ite' pane bahwa ite' samaan ani umpu pangatahuan. Pangatahuan umas sumbong, tapi kasih mambangun. \v 2 Sak ani sok da ngira bahwa ani da ni' pane, ini' tinga panane da saharus'a ini' pane. \v 3 Tapi, sak sook mangasihi Jabata, Jabata uga ngenal ini'. ->>>>>>> d70ce298aca22e4bcd85b5e0976e1d08959dda90 +\c 8 Pangkuman Da Gatn Persembah a' Ka Berhala \v 1 Mati', hal daging-daging da gatn persembah a' ka berhala-berhala. Ite pane bahwa ite samaan umpu pengetahuan. Pengetahuan umas sombong, tatapi kasih membangun. \v 2 Jika ani sok da ngira bahwa ni' pane jai hal, ni' tinga panane da sa harus a' ni' pane. \v 3 Namun, jika ani sok da mengasihi Jabata, ni' gatn kanan kat Jabata. \ No newline at end of file diff --git a/manifest.json b/manifest.json index fb85b16..7a912ff 100644 --- a/manifest.json +++ b/manifest.json @@ -85,6 +85,7 @@ "06-title", "06-01", "06-04", + "06-07", "06-09", "06-12", "06-14", @@ -108,6 +109,7 @@ "07-36", "07-39", "08-title", + "08-01", "08-04", "08-07", "08-08",