From acaeb7a6b8ed64564d4c7796fc30ec130a3a7378 Mon Sep 17 00:00:00 2001 From: tom_machinga Date: Thu, 26 Aug 2021 20:54:24 +0200 Subject: [PATCH] Thu Aug 26 2021 20:54:23 GMT+0200 (Central Africa Time) --- 02/01.txt | 6 +----- manifest.json | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/02/01.txt b/02/01.txt index bac4229..2d36ffd 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 2 \v 1 Ngako-ke umhlaba nelizulu besekuphelile, nako konkhe lokuphilako lokugcwaliswe kuko. \v 2 Ngelilanga lesikhombisa Nkulunkulu wafika emaphetselweni kwemsebenti wakhe bekawentile , ngako-ke waphumula. \v 3 Nkulunkulu walibusisa lilanga lesikhombisa walingcwelisa, ngoba waphumula emisebentini yonkhe labekaseyentile endalweni yakhe. -======= -\c 2 \v 1 Ngako-ke kwase kupheleliswa lizulu nemhlaba, nayo yonkhe indalo. \v 2 Ngelilanga lesikhombisa Nkulunkulu wacedza kudala konkhe wase uyaphumula,ngalelolanga lesikhombisa. \v 3 Nkulunkulu walibusisa lilanga lesikhombisa wase uyaligcwelisa, ngoba kulo lelo langa waphumula nasekacedze kudala konkhe. ->>>>>>> b02b872052a4a9d5e4080e384af225fe95a20b48 +\c 2 \v 1 Ngako-ke umhlaba nelizulu besekuphelile, nako konkhe lokuphilako lokugcwaliswe kuko. \v 2 Ngelilanga lesikhombisa Nkulunkulu wafika emaphetselweni kwemsebenti wakhe bekawentile , ngako-ke waphumula. \v 3 Nkulunkulu walibusisa lilanga lesikhombisa walingcwelisa, ngoba waphumula emisebentini yonkhe labekaseyentile endalweni yakhe. \ No newline at end of file diff --git a/manifest.json b/manifest.json index e2a5658..ac148ee 100644 --- a/manifest.json +++ b/manifest.json @@ -55,6 +55,7 @@ "01-28", "01-30", "02-title", + "02-01", "02-04", "02-07", "02-09",