From 9510493e834cd77caf7434c7a2fb11c2783a984c Mon Sep 17 00:00:00 2001 From: "bahasatech.indotengah" Date: Mon, 26 Oct 2020 17:07:28 +0800 Subject: [PATCH] Mon Oct 26 2020 17:07:27 GMT+0800 (Malay Peninsula Standard Time) --- 07/04.txt | 6 +----- 07/15.txt | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/07/04.txt b/07/04.txt index 0c1c17a..02d58df 100644 --- a/07/04.txt +++ b/07/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Orona netti, Oledadi-oledadigu, yemmi kaina bi mate tagu Hukum Taurat lewata tou karittu ga'ika yemmi jadi milik a wede, niado Nia ne papakededa wali matedana niaka ghitto ta kolege ghuwa tagu Mori. \v 5 neghe ghitto bata moripapo barra kana'a, hawa nafsu dirraka ne paransangda oro Hukum Taurat paghilli barra anggota-anggota touda ghitto tagu kolena ghuwa tagu maut. -======= -\v 4 Orona netti, Oledadi-oledadigu, yemmi kaina bi mate tagu Hukum Taurat lewata tou karittu ga'ika yemmi jadi milik a wede, niado Nia ne papakededa wali matedana niaka ghitto ta kolege ghuwa tagu Mori. \v Niawe, neghe ghitto bata moripapo barra kana'a, hawa nafsu dirraka ne paransangda oro Hukum Taurat paghilli barra anggota-anggota touda ghitto tagu kolena ghuwa tagu maut. ->>>>>>> 074eee92a285ae6c24a8194057b889b003b3b240 +\v 4 Orona netti, Oledadi-oledadigu, yemmi kaina bi mate tagu Hukum Taurat lewata tou karittu ga'ika yemmi jadi milik a wede, niado Nia ne papakededa wali matedana niaka ghitto ta kolege ghuwa tagu Mori. \v 5 neghe ghitto bata moripapo barra kana'a, hawa nafsu dirraka ne paransangda oro Hukum Taurat paghilli barra anggota-anggota touda ghitto tagu kolena ghuwa tagu maut. \ No newline at end of file diff --git a/07/15.txt b/07/15.txt index 630ae53..af83445 100644 --- a/07/15.txt +++ b/07/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Niawe, zauwa daku mangertikige appawe neghe parawigu orona zauwa dakku rawikige hal neghe pabeigu, melainkan zauwa ku rawige ne hal pabuttugu ate. \v 16 Takka nia, niaka zauwa ku rawige suatu hal ne dappa bei rawigu, zauwa kusetujuwe bawa Hukum Taurat netti naduawe. -======= -\v Niawe, zauwa daku mangertikige appawe neghe parawigu orona zauwa dakku rawikige hal neghe pabeigu, melainkan zauwa ku rawige ne hal pabuttugu ate. \v 16 Takka nia, niaka zauwa ku rawige suatu hal ne dappa bei rawigu, zauwa kusetujuwe bawa Hukum Taurat netti naduawe. ->>>>>>> 074eee92a285ae6c24a8194057b889b003b3b240 +\v 15 Niawe, zauwa daku mangertikige appawe neghe parawigu orona zauwa dakku rawikige hal neghe pabeigu, melainkan zauwa ku rawige ne hal pabuttugu ate. \v 16 Takka nia, niaka zauwa ku rawige suatu hal ne dappa bei rawigu, zauwa kusetujuwe bawa Hukum Taurat netti naduawe. \ No newline at end of file