From fd9a7056fe99abc15262af64d7f7ea7d2b929d65 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Wed, 10 Apr 2024 09:46:01 +0200 Subject: [PATCH] Wed Apr 10 2024 09:45:59 GMT+0200 (Central Africa Time) --- 17/11.txt | 6 +----- 17/14.txt | 6 +----- 17/17.txt | 6 +----- manifest.json | 8 ++++++++ 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/17/11.txt b/17/11.txt index 7a6df7c..9aa7635 100644 --- a/17/11.txt +++ b/17/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Jesus wazira atja, " Elija meya mowatjiri okupwisa ovina avihe. \v 12 Nu mimuraere, Elijah weya rukuru, nu kavenaa ve mutjiwa. Mu naho vaungura mbimavevanga kuye. Mo muhingo mbu, omuna womundu mamunu ouzeu ko maako wao. \v 13 Tjapu ovahongewa otjiva muna kutja mahungire ouhunga na Johanesa omupapitise -======= -\v 11 Jesus wazira atja,''tjiri Elia ongumatengepo okuya,neye mayarura avihe koupe. \v 12 Nu mimuraere,Elia weya rukuru, nu kavenaa ve mutjiwa. Mu naho vaungura mbimavevanga kuye,Mo muhingo mbu,Omuna womundu mave matatumisiwa. \v 13 Tjapu ovahongewa otjiva vazuu nawa kutja ma hungire ouhunga na Johanes omupapitise. ->>>>>>> 83474aaeb45dcafb0afb352f397e813b09c61aa2 +\v 11 Jesus wazira atja, " Elija meya mowatjiri okupwisa ovina avihe. \v 12 Nu mimuraere, Elijah weya rukuru, nu kavenaa ve mutjiwa. Mu naho vaungura mbimavevanga kuye. Mo muhingo mbu, omuna womundu mamunu ouzeu ko maako wao. \v 13 Tjapu ovahongewa otjiva muna kutja mahungire ouhunga na Johanesa omupapitise \ No newline at end of file diff --git a/17/14.txt b/17/14.txt index f0e6279..6a4bdde 100644 --- a/17/14.txt +++ b/17/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Tjivaya kotjimbumba, omurumendu weere kuye, atwike ozongoro kuye, natja, " \v 15 Muhona, totjari no muzandona wandje, upumbuka navi. Otjewira mezuko nomomiya naho. \v 16 Mbemuweeta kovahongewa, nu kavemuverurire." -======= -\v 15 Nowo tji va yarukire kotjimbumba tjovandu,aire tjipeya omundu omundu ku Jesus,a woro ozongoro komurungu we, \v 14 Na tja ''Muhona ,totjari nomuzandona wandje, eye wavera orusenge uwira mezuko nu wina potwingi uwira momiya noho. \v 16 Ami mbe etere kovahongewa voye nowo kavesorere okumuverukisa.'' ->>>>>>> 83474aaeb45dcafb0afb352f397e813b09c61aa2 +\v 14 Tjivaya kotjimbumba, omurumendu weere kuye, atwike ozongoro kuye, natja, " \v 15 Muhona, totjari no muzandona wandje, upumbuka navi. Otjewira mezuko nomomiya naho. \v 16 Mbemuweeta kovahongewa, nu kavemuverurire." \ No newline at end of file diff --git a/17/17.txt b/17/17.txt index f3b7302..f8f6b23 100644 --- a/17/17.txt +++ b/17/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Jesus wazira atjaa," Muhoko muhakambura, matuso kukara pamwe pupatapi? Miso kumu toora pupetapi? Mweeta kwami ngu ." \v 18 Jesus watena ozombepo ozohakohoke, nu zapita muye, nu omuzandu waverukira mbo. -======= -\v 17 Nu Jesus wazira atja ,'' Muhoko omuhinangamburiro nu mbumwapuka ! mekara punaene ngaarune? mekara no muretima naene ngaarune? eteye muzandu nguno ku Ami!'' \v 18 Jesus watena ozombepo ozohakohoke,nu zapita muye moiri ndjo,nu omuzandu waverukira mbo. ->>>>>>> 83474aaeb45dcafb0afb352f397e813b09c61aa2 +\v 17 Jesus wazira atjaa," Muhoko muhakambura, matuso kukara pamwe pupatapi? Miso kumu toora pupetapi? Mweeta kwami ngu ." \v 18 Jesus watena ozombepo ozohakohoke, nu zapita muye, nu omuzandu waverukira mbo. \ No newline at end of file diff --git a/manifest.json b/manifest.json index c359dbc..c554aa6 100644 --- a/manifest.json +++ b/manifest.json @@ -288,6 +288,14 @@ "16-24", "16-27", "17-title", + "17-01", + "17-03", + "17-05", + "17-09", + "17-11", + "17-14", + "17-17", + "17-19", "17-22", "17-24", "17-26",