From ef25f62ff37dfd1a5bde9e87e854bbcae27ad43e Mon Sep 17 00:00:00 2001 From: nicholuskombo Date: Mon, 7 Nov 2022 19:47:29 +0300 Subject: [PATCH] Mon Nov 07 2022 19:47:27 GMT+0300 (East Africa Time) --- 45/04.txt | 6 +----- manifest.json | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/45/04.txt b/45/04.txt index 54917fe..fc3784c 100644 --- a/45/04.txt +++ b/45/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Hivi ndivyo unapaswa kusema kwake: "Yahwe asema hivi: Ona, nilichokijenga, sasa ninakirarua chini. Nilichopanda, sasa ninaking'oa. Nitafanya hivi kote duniani. \v 5 Lakini je, unategema mambo makubwa kwa ajili yako? Usitegemee hayo. Uone, maafa yanakuja juu ya binadamu wote--hii ni tamko la Yahwe--lakini ninakupa maisha yako kama nyara popote utakakoenda." -======= -\v 4 Hivi ndivyo unapaswa kusema kwake: "Yahwe asema hivi: Ona, nilichojenga, sasa ninararua chini. Nilichopanda, sasa ninang'oa. Hii ni kweli juu ya dunia. \v 5 Lakini unategema mambo makubwa kwa ajili yako? Usitegemee hayo. Uone, maafa yanakuja kwa binadamu wote - hii ni tamko la Yahwe - lakini ninakupa maisha yangu kama nyara popote utakakoenda." ->>>>>>> a69b3592141fa67a42997a06406ea518eef6a113 +\v 4 Hivi ndivyo unapaswa kusema kwake: "Yahwe asema hivi: Ona, nilichokijenga, sasa ninakirarua chini. Nilichopanda, sasa ninaking'oa. Nitafanya hivi kote duniani. \v 5 Lakini je, unategema mambo makubwa kwa ajili yako? Usitegemee hayo. Uone, maafa yanakuja juu ya binadamu wote--hii ni tamko la Yahwe--lakini ninakupa maisha yako kama nyara popote utakakoenda." \ No newline at end of file diff --git a/manifest.json b/manifest.json index de99388..23c8a79 100644 --- a/manifest.json +++ b/manifest.json @@ -281,6 +281,8 @@ "44-26", "44-29", "45-title", + "45-01", + "45-04", "46-title", "47-title", "48-title",