From 820c27bb136314be6d7de0d3d767f3942517048f Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Mon, 4 Dec 2023 13:25:44 +0000 Subject: [PATCH] Mon Dec 04 2023 13:25:43 GMT+0000 (Western European Standard Time) --- 07/01.txt | 6 +----- 11/01.txt | 6 +----- manifest.json | 3 ++- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/07/01.txt b/07/01.txt index e3a3558..9e41c9b 100644 --- a/07/01.txt +++ b/07/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 7 \v 1 Zwino pamusoro pezwamakanyora: "Zwakanaka kuti murume asabate mukadzi". \v 2 Asi nekuda kwe ufewe, murume umwe neumwe anofanira kuwa nemukadzi wake, uye mukadzi umwe neumwe anofanira kuwa nemurume wake. -======= -\v 1 Zwino pamusoro pezwamakanyora: "Zwakanaka kuti murume asabate mukadzi". \v 2 Asi nekuda kwe ufewe, murume umwe neumwe anofanira kuwa nemukadzi wake, uye mukadzi umwe neumwe anofanira kuwa nemurume wake. ->>>>>>> 6c71cb68814c7efab64fa1ddf307dd035d88eec6 +\c 7 \v 1 Zwino pamusoro pezwamakanyora: "Zwakanaka kuti murume asabate mukadzi". \v 2 Asi nekuda kwe ufewe, murume umwe neumwe anofanira kuwa nemukadzi wake, uye mukadzi umwe neumwe anofanira kuwa nemurume wake. \ No newline at end of file diff --git a/11/01.txt b/11/01.txt index 0802229..c287f39 100644 --- a/11/01.txt +++ b/11/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 11 \v 1 Iwai watewedzer wangu, se zvandir muKristo. \v 2 zvino imi ndinokurumbidzai nekuda kwekundirangarira mune zvese, uye makabata nemwazvo tsika sedzandanga ndakupai. \v 3 Zvino ndinoda kuti muziwe kuti Kristo musoro wemurume, murume musoro wemukadzi, uye Mwari ndimusoro waKristo. \v 4 Kana chero munhu akanamata kana kuporofita nemusoro wakafukidzwa arikushora musoro wake. -======= -\v 1 Iwai watewedzer wangu, se zvandir muKristo. \v 2 zvino imi ndinokurumbidzai nekuda kwekundirangarira mune zvese, uye makabata nemwazvo tsika sedzandanga ndakupai. \v 3 Zvino ndinoda kuti muziwe kuti Kristo musoro wemurume, murume musoro wemukadzi, uye Mwari ndimusoro waKristo. \v 4 Kana chero munhu akanamata kana kuporofita nemusoro wakafukidzwa arikushora musoro wake. ->>>>>>> 6c71cb68814c7efab64fa1ddf307dd035d88eec6 +\c 11 \v 1 Iwai watewedzer wangu, se zvandir muKristo. \v 2 zvino imi ndinokurumbidzai nekuda kwekundirangarira mune zvese, uye makabata nemwazvo tsika sedzandanga ndakupai. \v 3 Zvino ndinoda kuti muziwe kuti Kristo musoro wemurume, murume musoro wemukadzi, uye Mwari ndimusoro waKristo. \v 4 Kana chero munhu akanamata kana kuporofita nemusoro wakafukidzwa arikushora musoro wake. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 224e813..09ffb63 100644 --- a/manifest.json +++ b/manifest.json @@ -37,7 +37,8 @@ "Carlitos Joao Pedro", "Itai", "salomao", - "salomao charles meque" + "salomao charles meque", + "Carlitos JP Alfazema" ], "finished_chunks": [ "02-title",