From 76746f217d9e04f8187c2a303c0124759e7690c3 Mon Sep 17 00:00:00 2001 From: stewardd Date: Wed, 7 Mar 2018 21:31:29 +0200 Subject: [PATCH] Wed Mar 07 2018 21:31:29 GMT+0200 (South Africa Standard Time) --- 06/01.txt | 6 +----- 06/04.txt | 6 +----- 06/08.txt | 6 +----- 06/11.txt | 6 +----- 06/14.txt | 6 +----- 06/17.txt | 6 +----- 6 files changed, 6 insertions(+), 30 deletions(-) diff --git a/06/01.txt b/06/01.txt index 09ed414..f897aee 100644 --- a/06/01.txt +++ b/06/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 6 \v 1 Mi linu, nibasebeza hamwina, tumi kumbila sanzi mutambuli chisemo che Ireeza nikusena chimwi. \v 2 Kakuti uwamba kuti, ''mwi nako iswanela niva ku tekelezi , mi mwi nako yaku hazwa ni ku hazi.'' Lole, inu nji nako iswanela. lole, hunu njinako yaku hazwa. \v 3 Katuviki chisitataliso havusu bwa zumwi. Mukuti katulakalezi i luko lyetu kuti sanzi linjili nkani. -======= -\c 6 \v 1 Imi hape, kusebezisana hamwina, tumikumbila kusatambula ikanya ye Ireeza isena musebezi. sina aba wambi,Munako iswanela, Nibatekikwako. \v 2 Imi mwizuba lye mpuluso ni bakutusi.'' lole hanu chinako iswanela.'' Lole hanu izuba lyempuluso. \v 3 kanzitubiki zisitataliso habusu bwazumwi mukuti kazilete musebezi we Ireeza kushinyeha. ->>>>>>> 8e75d12f7779a13d851d148e43fefa5cf1e6743b +\c 6 \v 1 Imi hape, kusebezisana hamwina, tumikumbila kusatambula ikanya ye Ireeza isena musebezi. sina aba wambi,Munako iswanela, Nibatekikwako. \v 2 Imi mwizuba lye mpuluso ni bakutusi.'' lole hanu chinako iswanela.'' Lole hanu izuba lyempuluso. \v 3 kanzitubiki zisitataliso habusu bwazumwi mukuti kazilete musebezi we Ireeza kushinyeha. \ No newline at end of file diff --git a/06/04.txt b/06/04.txt index d2a6684..74a70b6 100644 --- a/06/04.txt +++ b/06/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Kwanda a vulyo, to paka mikwa yetu mumi tendo yonso, kuti tuva hikana ve Ireeza. Tuva hikana vakwe muku tundamena ahulu, mubukabo, \v 5 mukundamiwa, mukubikiwa mwi ntorongo, mu kulwa, muku sebeza ahulu, muku saba ni Ñonzi masiku, mwi nzala, \v 6 mu kulinjoloza, mungana, mukusa benga, muchi shemo, Muluhuho lu Njolola, mwi rato likolete. \v 7 Tuba hikana bakwe mulinzwi lye niti, ni ziho ze Irreza. Twina zilwiso zo kuluka kuze nyanza lye chilso ni kulye chimonso. -======= -\v 4 Mukuti, tuli kolwisisa tubonse cha misebezi yetu. Mukuti tubahika be Ireeza. \v 5 Tubahikana bakwe mukutundamena, mukuzwafiswa, mumanyando, mukudamwa,mukusuminwa, mukulwiswa, mumasukuluka, mukulala chilabila, \v 6 munzala, mukujolola, munzibo, munkulo-nde, mukushiyama, muchisemo, muluhuho lujolola, nimwilato lishiyeme. \v 7 Tubahikana bakwe ni mwinzwi lyeniti, nimuziho ze Ireeza. imi twina insilelezo inakwiyanza lijolola linakubulyo niku lyachimonso. ->>>>>>> 8e75d12f7779a13d851d148e43fefa5cf1e6743b +\v 4 Mukuti, tuli kolwisisa tubonse cha misebezi yetu. Mukuti tubahika be Ireeza. \v 5 Tubahikana bakwe mukutundamena, mukuzwafiswa, mumanyando, mukudamwa,mukusuminwa, mukulwiswa, mumasukuluka, mukulala chilabila, \v 6 munzala, mukujolola, munzibo, munkulo-nde, mukushiyama, muchisemo, muluhuho lujolola, nimwilato lishiyeme. \v 7 Tubahikana bakwe ni mwinzwi lyeniti, nimuziho ze Ireeza. imi twina insilelezo inakwiyanza lijolola linakubulyo niku lyachimonso. \ No newline at end of file diff --git a/06/08.txt b/06/08.txt index 839bfee..682bffa 100644 --- a/06/08.txt +++ b/06/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Tusebeza muku sepahala ni kunyazwa, mu nyanswa ni kurumbiwa. Tunyasiwa kuti tuchengerera mihe tu sepahala. \v 9 Tusebeza mane ubu kena tubali kwi nzibahere mi tusi zabahere luli. Tusebeza ubu kufwa ni - bone! - tusi hala. Tusebeza ubu tunyandisizwa zitupanga kono isiñi ubu ba atulerwe kwi ifu. \v 10 Tusebeza ubu ba lira, kono inko nyonse tu sangitwe, Tusebeza ube tutubotana, kono tukwete kupanga bungi chifumu. Tusebeza ubu tusena chimwi mi kono ubu bakwete zintu zonse. -======= -\v 8 Tusebeza mwikute, ni mukusakutekeha, ni mukuwambwa bubi, ni mukububekwa. Tunyanswa mukuti tuwamba mapa imi nituwamba ze niti. \v 9 Tusebeza sina katwizibitwe imi kanti twizibenkene. tusebeza sina bayakukufwa,mi mulole tusihala, Tusebeza sina bahindikitwe munkezozetu kono katunyansilizwe mukufwa. tusebeza sina basukulukite kanti inakoyonse tusangite. \v 10 Tusebeza sina bashebete, kono kanti tubika bangi kuba bafumite. Tusebeza ni tusawani chimwi kanti katuwane, zintuzonse. ->>>>>>> 8e75d12f7779a13d851d148e43fefa5cf1e6743b +\v 8 Tusebeza mwikute, ni mukusakutekeha, ni mukuwambwa bubi, ni mukububekwa. Tunyanswa mukuti tuwamba mapa imi nituwamba ze niti. \v 9 Tusebeza sina katwizibitwe imi kanti twizibenkene. tusebeza sina bayakukufwa,mi mulole tusihala, Tusebeza sina bahindikitwe munkezozetu kono katunyansilizwe mukufwa. tusebeza sina basukulukite kanti inakoyonse tusangite. \v 10 Tusebeza sina bashebete, kono kanti tubika bangi kuba bafumite. Tusebeza ni tusawani chimwi kanti katuwane, zintuzonse. \ No newline at end of file diff --git a/06/11.txt b/06/11.txt index 6953ceb..9bf2f5c 100644 --- a/06/11.txt +++ b/06/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Tuba wambi buniti bonse kwenu , BenaMakorite, mi inkulo yetu i yalukite ahulu. \v 12 Inkulo zenu kazi kaninwe kwe tu , kono njenwe muzikanina cha maikuto enu. \v 13 Linu cho kuwamba hande - ni wamba kuba ubu kuba hwire - mwi yalule inkulo zenu a hulu. -======= -\v 11 Kanti, tuwamba kwenu zonse chabuniti. Makorinte, imi nkulo zetu ziyaluki. \v 12 Inkulo zenu kazisinene chetu, kono zisinene cha maikuto enu. \v 13 Hanu, mushelene ni wamba sina yowamba kumuhwile mwiyalule ahulu inkulo zenu. ->>>>>>> 8e75d12f7779a13d851d148e43fefa5cf1e6743b +\v 11 Kanti, tuwamba kwenu zonse chabuniti. Makorinte, imi nkulo zetu ziyaluki. \v 12 Inkulo zenu kazisinene chetu, kono zisinene cha maikuto enu. \v 13 Hanu, mushelene ni wamba sina yowamba kumuhwile mwiyalule ahulu inkulo zenu. \ No newline at end of file diff --git a/06/14.txt b/06/14.txt index f967626..17ddbf1 100644 --- a/06/14.txt +++ b/06/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Kanji mulihi chiyango niba sazumini. kakuti chili kani nzi icho kuluka chikuli kwete ni nikuse chilira mulao? Mi chilikaninzi iseri chili kwete ni fifi? \v 15 Chilikani nzi chaola kuba na Cho Khresite ni Belia? Kamba chiyemba nzi icho mulumeri chena hamwina niya zumini? \v 16 Mi chilikani nzi china hateni hakati ke tempere ye Irreeza ni maswaniso? Kakuti twi tempere ye Irreeza yo hala, sina Irreeza haba wambi: "Kani kale mukati kabo ni kuyenda mukati kabo. Kanibe Irreeza wabo, mi kababe bantu bangu." -======= -\v 14 Kanji, musuminwa hamwina nibasa zumini. Linu chinzi balukite abakopana niba tenda zive? Imi kanti chizwale nzii china mwiseli ne fifi? Kuzuminzana kwinabule kwena Jesu ni batenda zibe? \v 15 Kapa chinzi chali kauhanyeza mulumeli niyotenda zive? \v 16 Imi intumelelano nzi, ina mukati ke tempele ye Ireeza ni ziswaniso? Sina hatuli twi tempele ihala ye Ireeza, sine Ireeza habawambi: ''Kanizake mukatikabo imi niyende mukati kabo. Munibe Ireeze wabo, imi mubabe bantu bangu.'' ->>>>>>> 8e75d12f7779a13d851d148e43fefa5cf1e6743b +\v 14 Kanji, musuminwa hamwina nibasa zumini. Linu chinzi balukite abakopana niba tenda zive? Imi kanti chizwale nzii china mwiseli ne fifi? Kuzuminzana kwinabule kwena Jesu ni batenda zibe? \v 15 Kapa chinzi chali kauhanyeza mulumeli niyotenda zive? \v 16 Imi intumelelano nzi, ina mukati ke tempele ye Ireeza ni ziswaniso? Sina hatuli twi tempele ihala ye Ireeza, sine Ireeza habawambi: ''Kanizake mukatikabo imi niyende mukati kabo. Munibe Ireeze wabo, imi mubabe bantu bangu.'' \ No newline at end of file diff --git a/06/17.txt b/06/17.txt index 484fe9f..44f1bc5 100644 --- a/06/17.txt +++ b/06/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Lyahanu, "Muzwe mukati kabo, mi mulikauhanye," uwamba Irreeza. "Kanji mukwati zintu zisa njololi, mi kani amuhere. \v 18 Kanibe ni Shenu kwenu, mi kamube mubana bangu be chikwame nibe chikazana, "uwamba Simwine Wezihozonse. -======= -\v 17 Lyahanu, ''Muzwe mukati kabo imi mulikauhanye,'' mwatela Ireeza. Kanzi muwondi zintu zisa jolwele, imi muni mitambule. \v 18 Munibe Ishenu inwe mubebana bangu, imi kamube banabangu baba swisu niba kazana, ''Kuwamba Ireeza wina kwilu. ->>>>>>> 8e75d12f7779a13d851d148e43fefa5cf1e6743b +\v 17 Lyahanu, ''Muzwe mukati kabo imi mulikauhanye,'' mwatela Ireeza. Kanzi muwondi zintu zisa jolwele, imi muni mitambule. \v 18 Munibe Ishenu inwe mubebana bangu, imi kamube banabangu baba swisu niba kazana, ''Kuwamba Ireeza wina kwilu. \ No newline at end of file