From adebee8101878009d19ba59ecbf768df4a3c62c8 Mon Sep 17 00:00:00 2001 From: Itai_Viegas Date: Mon, 15 Apr 2024 07:29:43 +0200 Subject: [PATCH] Mon Apr 15 2024 07:29:42 GMT+0200 (Central Africa Time) --- 03/10.txt | 6 +----- 03/13.txt | 6 +----- 03/16.txt | 6 +----- front/title.txt | 2 +- manifest.json | 5 ++++- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/03/10.txt b/03/10.txt index 3b00335..8918990 100644 --- a/03/10.txt +++ b/03/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Petainga tichirinemwi takamupanga kuti: “Kudai aripo munhu usikadi kushanda, asazorha.” \v 11 Ngokuti tinozwa kuti vamweni vanoita nungo pakati penyu, vasikashandi, asi vanokangaidza vanhu. \v 12 Zvino avo vakadaro tinovapanga nokuvapota munaMambo Jesu Kristu kuti vashande mushando yavo ngekunyarara, varhe chingwa chawo. -======= -\v 10 Ngokuti patainga tesse taimuumiravo; ngokuti uwa Ashikadi kushanda, eshiphinginija Vamueni ashaha. \v 11 Ngokuti takazva kuti vamueni pakati penhu vaifamba vashina kurongeka, vashi kashandi, \v 12 Asi veshipinginija bassa rovamueni asi vakadaro tino vatxunguja kuna Mambo wedhu Jesu Kristo, kuti shandanhi mushikanesi vamueni muhe sadja renhu. ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\v 10 Petainga tichirinemwi takamupanga kuti: “Kudai aripo munhu usikadi kushanda, asazorha.” \v 11 Ngokuti tinozwa kuti vamweni vanoita nungo pakati penyu, vasikashandi, asi vanokangaidza vanhu. \v 12 Zvino avo vakadaro tinovapanga nokuvapota munaMambo Jesu Kristu kuti vashande mushando yavo ngekunyarara, varhe chingwa chawo. \ No newline at end of file diff --git a/03/13.txt b/03/13.txt index 4a4ceed..2c27a95 100644 --- a/03/13.txt +++ b/03/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Hama, musaremba kuita zvakanaka. \v 14 Kudai aripo munhu usikazkwii izwi redu reiyi tsamba, muringisisei munhuwo, kutimmusazkwanana naye, kuti ena adaniskwe. \v 15 Musazomuerenga kuti igaa, asi mumupange kudai ngehama. -======= -\v 13 Kwamuri vakoma, musharemba, kuita zvakanaka. \v 14 Asi kuno viya ashikazvi mazwi o tsamba iyi, eshi ngajua mushazobatana naye, kuti atweruke; \v 15 Mushazomutaja seimuvengi, asi muitennhi arihamaenhu. ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\v 13 Hama, musaremba kuita zvakanaka. \v 14 Kudai aripo munhu usikazkwii izwi redu reiyi tsamba, muringisisei munhuwo, kutimmusazkwanana naye, kuti ena adaniskwe. \v 15 Musazomuerenga kuti igaa, asi mumupange kudai ngehama. \ No newline at end of file diff --git a/03/16.txt b/03/16.txt index 3e33ace..78d5549 100644 --- a/03/16.txt +++ b/03/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 Mambo wokunyarara emene ngaamupe kunyarara nguva dzeshe nenjira dzeshe. Mambo ngaagare nemwi mweshe. \v 17 Inini Phauri ndanyora kutambisa uku ngenyara yangu yemene. Ichi chioniso chiri mutsamba yangu yeshe; ndiyo njira yendinonyora ndiyo. \v 18 Nyasha dzaMambo wedu Jesu Kristu ngadzigare nemwi mweshe. -======= -\v 16 Asi muari horunhararo ngamupe runhararo. Mambo ngagare kwamuri mese. \v 17 Kutxungamija konhara jangu, pauro, kusaina kwangu phatsamba yangu yese, kudhai ndinotara. \v 18 Nhasha jamambo Jesu Kristo ngajigare kwamuri. Amen ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\v 16 Mambo weronyararo emene ngaamupe kunyarara nguva dzeshe nenjira dzeshe. Mambo ngaagare nemwi mweshe. \v 17 Inini Phauri ndanyora kutambisa uku ngenyara yangu yemene. Ichi chioniso chiri mutsamba yangu yeshe; ndiyo njira yendinonyora ndiyo. \v 18 Nyasha dzaMambo wedu Jesu Kristu ngadzigare nemwi mweshe. \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index b293391..6b3e88e 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1 +1 @@ -2 Vathesaronika \ No newline at end of file +Tstamba 2 Vathesaronika \ No newline at end of file diff --git a/manifest.json b/manifest.json index 5ad5033..3f78505 100644 --- a/manifest.json +++ b/manifest.json @@ -56,6 +56,9 @@ "03-title", "03-01", "03-04", - "03-06" + "03-06", + "03-10", + "03-13", + "03-16" ] } \ No newline at end of file