From 82bb96f8c36af50a7fc942b723260a5b8af61049 Mon Sep 17 00:00:00 2001 From: Muzgatama Date: Sat, 31 Aug 2024 20:01:24 -0600 Subject: [PATCH] Sat Aug 31 2024 20:01:23 GMT-0600 (Central Standard Time) --- 01/title.txt | 14 +------------- 07/20.txt | 10 +--------- 09/11.txt | 10 +--------- 09/13.txt | 12 +----------- 09/16.txt | 10 +--------- 09/18.txt | 12 +----------- 09/21.txt | 10 +--------- 09/23.txt | 10 +--------- front/title.txt | 14 +------------- manifest.json | 5 ++++- 10 files changed, 13 insertions(+), 94 deletions(-) diff --git a/01/title.txt b/01/title.txt index bcd9dea..8a8a4e0 100644 --- a/01/title.txt +++ b/01/title.txt @@ -1,13 +1 @@ -<<<<<<< HEAD -Chandaano 1 -======= -<<<<<<< HEAD -Chandaano 1 -======= -<<<<<<< HEAD -Candaano 1 -======= -Chaandano 1 ->>>>>>> 62931c59a12ce702cb33f05c62d28805f43627a7 ->>>>>>> cdce75e26a8bdc6ac55ae7afc7f8af30393f1daa ->>>>>>> 80bf74f4979bd889a89e00b8eda27e4e459cb559 +Candaano 1 \ No newline at end of file diff --git a/07/20.txt b/07/20.txt index e889573..b4cca99 100644 --- a/07/20.txt +++ b/07/20.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -\v 20 Alimwi kakutabikwa bulyo kwiina kutapinga! bamwi bakaba bapaizhi chakutalipinga, \v 21 pele wakaba mupaizhi kwiita mukulipinga kuli wezo walo wakaamba kwakwe ati, "Mwami wapinga alimwi wiina naaya kuchincha muzeezo wakwe; 'Uuli mupaizhi wa lyoonse."' -======= -<<<<<<< HEAD -\v 20 Alimwi kakutabikwa bulyo kwiina kutapinga! bamwi bakaba bapaizhi chakutalipinga, \v 21 pele wakaba mupaizhi kwiita mukulipinga kuli wezo walo wakaamba kwakwe ati, "Mwami wapinga alimwi wiina naaya kuchincha muzeezo wakwe; 'Uuli mupaizhi wa lyoonse."' -======= -\v 20 Alimwi kakutambikwa bulyo kwiina kutapinga! bamwi bakaba bapaizhi chakutalipinga, \v 21 pele wakaba mupaizhi kwiita mukulipinga kuli wezo walo wakaamba kwakwe ati, "Mwami wapinga alimwi wiina naaya kachincha muzeezo wakwe; 'Uuli mupaizhi wa lyoonse."' ->>>>>>> cdce75e26a8bdc6ac55ae7afc7f8af30393f1daa ->>>>>>> 80bf74f4979bd889a89e00b8eda27e4e459cb559 +\v 20 Alimwi kakutambikwa bulyo kwiina kutapinga! bamwi bakaba bapaizhi chakutalipinga, \v 21 pele wakaba mupaizhi kwiita mukulipinga kuli wezo walo wakaamba kwakwe ati, "Mwami wapinga alimwi wiina naaya kachincha muzeezo wakwe; 'Uuli mupaizhi wa lyoonse."' \ No newline at end of file diff --git a/09/11.txt b/09/11.txt index 63c7ee3..aa71709 100644 --- a/09/11.txt +++ b/09/11.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -\v 11 Kilisito wakazhiza bu mupayizhi mukando uwa shintu shibotu shesho shakezhiza. Wakayita mushintu shikando alimwi u mwi tente libaala kululama lelyo lyatakapangwa u matashi a bantu, leli talili lyaanshi ano. \v 12 Kabutali bulowa bwa mpongo naa bwa boombe, pele ku bulowa bwakwe mwini wakanjila lyomwi lyalo mu busena busalalisha kuya kutuletela kunununwa kwa lyoonse. -======= -<<<<<<< HEAD -\v 11 Kilisito wakazhiza bu mupayizhi mukando uwa shintu shibotu shesho shakezhiza. Wakayita mushintu shikando alimwi u mwi tente libaala kululama lelyo lyatakapangwa u matashi a bantu, leli talili lyaanshi ano. \v 12 Kabutali bulowa bwa mpongo naa bwa boombe, pele ku bulowa bwakwe mwini wakanjila lyomwi lyalo mu busena busalalisha kuya kutuletela kunununwa kwa lyoonse. -======= -\v 11 \v 12 Kilisto wakehiza mupaizhi mukando uwashintu shibotu shesho ushashika. wakashika nushintu shikando uchikombelo chibotu checho uchatakapangwa umatashi amuntu, atali aashi ano.-- Tabuli bulowa ubwa mpongo ubwa toombe, pele bulowa ubwakwe mbubwakanjilila umubusena ubusalalisha lyomwi kuli boonse ukubamba lifutuko ulutamani. ->>>>>>> cdce75e26a8bdc6ac55ae7afc7f8af30393f1daa ->>>>>>> 80bf74f4979bd889a89e00b8eda27e4e459cb559 +\v 11 Kilisito wakazhiza bu mupayizhi mukando uwa shintu shibotu shesho shakezhiza. Wakayita mushintu shikando alimwi u mwi tente libaala kululama lelyo lyatakapangwa u matashi a bantu, leli talili lyaanshi ano. \v 12 Kabutali bulowa bwa mpongo naa bwa boombe, pele ku bulowa bwakwe mwini wakanjila lyomwi lyalo mu busena busalalisha kuya kutuletela kunununwa kwa lyoonse. \ No newline at end of file diff --git a/09/13.txt b/09/13.txt index 187520e..717e644 100644 --- a/09/13.txt +++ b/09/13.txt @@ -1,11 +1 @@ -<<<<<<< HEAD -\v 13 Kuti naa bulowa bwa mpongo bwa bachende alimwi u kusansaila itwe lya boombe bapwizhi aali babo bakalisofwaazha kulasalazha mibili yabo, - \v 14 chaakuli bobo chili buti ku bulowa bwaka kilisito, kwiita mu moza wa lyoonse wakalipa lwakwe mwini chakubula kampenda kwa Leza, wakasalazha manjezheezha esu kuhwa ku milimo mifwu kwiza kusebezela Leza mumi? \v 15 Ku kaambo kaka, ngu shimuzhima akati wa chihwuminano chipiya. Chechi chili bolya, u kuti lufwu lwakaba kale kunununa babo bali mu chihwuminano chitaanzhi kuvwa ku bubiyabi bwabo, babo balo bakoompololwa balakatambula chishomezho cha lukono lwa lyoonse. -======= -<<<<<<< HEAD -\v 13 Kuti naa bulowa bwa mpongo bwa bachende alimwi u kusansaila itwe lya boombe bapwizhi aali babo bakalisofwaazha kulasalazha mibili yabo, - \v 14 chaakuli bobo chili buti ku bulowa bwaka kilisito, kwiita mu moza wa lyoonse wakalipa lwakwe mwini chakubula kampenda kwa Leza, wakasalazha manjezheezha esu kuhwa ku milimo mifwu kwiza kusebezela Leza mumi? \v 15 Ku kaambo kaka, ngu shimuzhima akati wa chihwuminano chipiya. Chechi chili bolya, u kuti lufwu lwakaba kale kunununa babo bali mu chihwuminano chitaanzhi kuvwa ku bubiyabi bwabo, babo balo bakoompololwa balakatambula chishomezho cha lukono lwa lyoonse. -======= -\v 13 \v 14 \v 15 ukuti na bulowa ubwampongo ubwa ba cheendealimwi ukusansaila ukwa mpwizhi itwe ubobo ubatasalali kabapa impaizhi kusalazha mibili yabo.-- Nochilibuti unizho bulowa ubwa kilisito, kwitila mumoza uwa leza wakalipa mukamwini umwina ubulemu nibuba bomwi ukwa leza. atulisalazhe kuvwa kuchinto ifwile kaamba tusebezele leza ulanga?-- kaambo kutelaika koku, nguhimina momu muchipangano chipiya. chechi chili bobo, pele lufu mbulwachitikila kale kununina babo ubali muchipangano uchakataanguna kuvwa kushibi babo ubati bakompololwe balakatumbola chishomyo ucha bumi butamani. ->>>>>>> cdce75e26a8bdc6ac55ae7afc7f8af30393f1daa ->>>>>>> 80bf74f4979bd889a89e00b8eda27e4e459cb559 +\v 13 \v 14 \v 15 ukuti na bulowa ubwampongo ubwa ba cheendealimwi ukusansaila ukwa mpwizhi itwe ubobo ubatasalali kabapa impaizhi kusalazha mibili yabo.-- Nochilibuti unizho bulowa ubwa kilisito, kwitila mumoza uwa leza wakalipa mukamwini umwina ubulemu nibuba bomwi ukwa leza. atulisalazhe kuvwa kuchinto ifwile kaamba tusebezele leza ulanga?-- kaambo kutelaika koku, nguhimina momu muchipangano chipiya. chechi chili bobo, pele lufu mbulwachitikila kale kununina babo ubali muchipangano uchakataanguna kuvwa kushibi babo ubati bakompololwe balakatumbola chishomyo ucha bumi butamani. \ No newline at end of file diff --git a/09/16.txt b/09/16.txt index da31ab7..2347460 100644 --- a/09/16.txt +++ b/09/16.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -\v 16 Awo aali bulembe, bwa twaambo twa lufwu lwa muntu wakachilemba ulyeelele kubona kwaamba ati uuli twaambo ulifwile. \v 17 Kaambo bulembe bulakwata mulimo kwaba lufwu, u bobo chiina mulimo kuti wezo wakachilemba ka chipona. -======= -<<<<<<< HEAD -\v 16 Awo aali bulembe, bwa twaambo twa lufwu lwa muntu wakachilemba ulyeelele kubona kwaamba ati uuli twaambo ulifwile. \v 17 Kaambo bulembe bulakwata mulimo kwaba lufwu, u bobo chiina mulimo kuti wezo wakachilemba ka chipona. -======= -\v 16 \v 17 kaambo ukuli kuzandisha lufu ulwamuntu uwakapanga chilyeleelele kubonya.-- kaambo kuzndisha kulabonya kwaba lufu, ubobo kulabula buchite wezo uwachipanga uchipona. ->>>>>>> cdce75e26a8bdc6ac55ae7afc7f8af30393f1daa ->>>>>>> 80bf74f4979bd889a89e00b8eda27e4e459cb559 +\v 16 \v 17 kaambo ukuli kuzandisha lufu ulwamuntu uwakapanga chilyeleelele kubonya.-- kaambo kuzndisha kulabonya kwaba lufu, ubobo kulabula buchite wezo uwachipanga uchipona. \ No newline at end of file diff --git a/09/18.txt b/09/18.txt index 8bf37c0..741539e 100644 --- a/09/18.txt +++ b/09/18.txt @@ -1,11 +1 @@ -<<<<<<< HEAD -\v 18 U bobo nikuba kuti acho chihwuminano cha kutanguna ka chitakonzha kuchitwa kwiina bulowa. - \v 19 Kaambo mozesi wakabapa malayilile woonse aali mu mulawo bantu boonse, wakabweza bulowa bwa boombe u bwa mpongo, u meenzhi, u butonge busubila, u chisamu cha hisopu, wakalisansaila ibuka lini u bantu boonse. \v 20 Amane wakaamba ati, "Bobu mbulowa bwa chihwumunano checho Leza nchaakalayilila kwenu." -======= -<<<<<<< HEAD -\v 18 U bobo nikuba kuti acho chihwuminano cha kutanguna ka chitakonzha kuchitwa kwiina bulowa. - \v 19 Kaambo mozesi wakabapa malayilile woonse aali mu mulawo bantu boonse, wakabweza bulowa bwa boombe u bwa mpongo, u meenzhi, u butonge busubila, u chisamu cha hisopu, wakalisansaila ibuka lini u bantu boonse. \v 20 Amane wakaamba ati, "Bobu mbulowa bwa chihwumunano checho Leza nchaakalayilila kwenu." -======= -\v 18 \v 19 \v 20 Ubobo nikuba chipangano uchakutanguna chaapangwa ukwiina bulowa. -- kaambo mozesi wakapa mulawo umulawo insana kubantu boonse, wakabweza bulowa ubwa toombe ubwa tupongo, umeenzhi, uchi woolu uchisubila, u hysop, ukusansaila ibuka ubantu boonse. Amane wakaamba, "bobu mbulowa ubwa chipangano checho leza chakamba ucha nsana ukwenu." ->>>>>>> cdce75e26a8bdc6ac55ae7afc7f8af30393f1daa ->>>>>>> 80bf74f4979bd889a89e00b8eda27e4e459cb559 +\v 18 \v 19 \v 20 Ubobo nikuba chipangano uchakutanguna chaapangwa ukwiina bulowa. -- kaambo mozesi wakapa mulawo umulawo insana kubantu boonse, wakabweza bulowa ubwa toombe ubwa tupongo, umeenzhi, uchi woolu uchisubila, u hysop, ukusansaila ibuka ubantu boonse. Amane wakaamba, "bobu mbulowa ubwa chipangano checho leza chakamba ucha nsana ukwenu." \ No newline at end of file diff --git a/09/21.txt b/09/21.txt index 16f7d21..be795a6 100644 --- a/09/21.txt +++ b/09/21.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -\v 21 Munzhila njiyona yezho, wakasansayila bulowa e tente u shisebezho shoonse shakusebezha mu mulimo. \v 22 Kwiingayina u mulawo, shoonse shakasalazhiwa ku bulowa. U kwiina kutila bulowa kwiina kulekelelwa kwa shibi. -======= -<<<<<<< HEAD -\v 21 Munzhila njiyona yezho, wakasansayila bulowa e tente u shisebezho shoonse shakusebezha mu mulimo. \v 22 Kwiingayina u mulawo, shoonse shakasalazhiwa ku bulowa. U kwiina kutila bulowa kwiina kulekelelwa kwa shibi. -======= -\v 21 \v 22 Muhila yomwi, wakasasaila bulowa muchopaililo ushakusebezha shoonse ushakusebezha muchipaililo. -- kuchilila mulawo, shoonse shakasalazhiwa ubulowa. ukwiina kutila bulowa kwiina kulekelelwa. ->>>>>>> cdce75e26a8bdc6ac55ae7afc7f8af30393f1daa ->>>>>>> 80bf74f4979bd889a89e00b8eda27e4e459cb559 +\v 21 \v 22 Muhila yomwi, wakasasaila bulowa muchopaililo ushakusebezha shoonse ushakusebezha muchipaililo. -- kuchilila mulawo, shoonse shakasalazhiwa ubulowa. ukwiina kutila bulowa kwiina kulekelelwa. \ No newline at end of file diff --git a/09/23.txt b/09/23.txt index 5065be0..906042c 100644 --- a/09/23.txt +++ b/09/23.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -\v 23 Inzho chilazandika kwaamba ati shikozhana u shintu sha kwizeulu shilyeelele kusalazhiwa u shipayizho sha banyama baba. Nikuba bobo, shintu sha mazeulu shalo shini shilyeelele kusalazhiwa shipayizho shibotusha. \v 24 Kaambo Kilisito wiina naakanjila mu busna busalalisha bwa kapangwa u matashi a bantu, chalo chilakozhana bulyo u chikozhano chini chini. Pele wakanjila kwizeulu kwini, kuya kutuzhiminina kumbele lya leza u kaambo kesu. -======= -<<<<<<< HEAD -\v 23 Inzho chilazandika kwaamba ati shikozhana u shintu sha kwizeulu shilyeelele kusalazhiwa u shipayizho sha banyama baba. Nikuba bobo, shintu sha mazeulu shalo shini shilyeelele kusalazhiwa shipayizho shibotusha. \v 24 Kaambo Kilisito wiina naakanjila mu busna busalalisha bwa kapangwa u matashi a bantu, chalo chilakozhana bulyo u chikozhano chini chini. Pele wakanjila kwizeulu kwini, kuya kutuzhiminina kumbele lya leza u kaambo kesu. -======= -\v 23 \v 24 Ubobo chilazandika ukoya mbuchibele ukwizeulu shilyelele kusalazhiwa ubanyama baba. ubobo, ysha kwizeulu shilyelele kusalazhiwa impaizho imbotu. -- kaambo kilisitu wina ukengula mubusna ubusalalisha ubwakapangwa umatashi, uchli chikozhanyo ucha chini chini. wakanjila kwizeulu kuya kubonekela kumbele ulya leza kaambo ukensu. ->>>>>>> cdce75e26a8bdc6ac55ae7afc7f8af30393f1daa ->>>>>>> 80bf74f4979bd889a89e00b8eda27e4e459cb559 +\v 23 Inzho chilazandika kwaamba ati shikozhana u shintu sha kwizeulu shilyeelele kusalazhiwa u shipayizho sha banyama baba. Nikuba bobo, shintu sha mazeulu shalo shini shilyeelele kusalazhiwa shipayizho shibotusha. \v 24 Kaambo Kilisito wiina naakanjila mu busna busalalisha bwa kapangwa u matashi a bantu, chalo chilakozhana bulyo u chikozhano chini chini. Pele wakanjila kwizeulu kwini, kuya kutuzhiminina kumbele lya leza u kaambo kesu. \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index bd5c4cf..752e5c4 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,13 +1 @@ -<<<<<<< HEAD -Ba Hebulu. -======= -<<<<<<< HEAD -Ba Hebulu. -======= -<<<<<<< HEAD -Ba Hebulu. -======= -Hebulu ->>>>>>> 62931c59a12ce702cb33f05c62d28805f43627a7 ->>>>>>> cdce75e26a8bdc6ac55ae7afc7f8af30393f1daa ->>>>>>> 80bf74f4979bd889a89e00b8eda27e4e459cb559 +Hebulu \ No newline at end of file diff --git a/manifest.json b/manifest.json index f26d5eb..0e9e534 100644 --- a/manifest.json +++ b/manifest.json @@ -42,9 +42,12 @@ "CHIPOLA1", "chipola1", "Evans chipola", - "Chipola1" + "Chipola1", + "Timothy Muzgatama" ], "finished_chunks": [ + "front-title", + "01-title", "01-01", "01-04", "01-06",