diff --git a/15/01.txt b/15/01.txt index 0dd44bf..1ddf142 100644 --- a/15/01.txt +++ b/15/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 15 \v 1 Lyinu ba kunganyi va malyi ne vamwi va vachita zivi va veeza kwa Jeeso ku ku muteeka. \v 2 Voonse ma-Farasayi ne masikiriba va vaalyi ku vireera mukati kaavo, ni vati, " Wuuzu mukwaame u tambula va chita zivi, mane wulya naavo." -======= -\c 15 \v 1 Hoohwaaho, vaakunganyi vo muteero ne vaamwi va chiitazivi va vaalyi kwiiza kwa Jeeso ku muteeka. \v 2 Voonse maFarasai ne vangolyi va vaalyi kulyi kutoongooka, nivaati, '' Uuzu mukwaame u taambula veena ziivi, maane ulya naavo.'' ->>>>>>> f369f708cc76edac6ab2b13e50c7b61e6b75b772 +\c 15 \v 1 Lyinu ba kunganyi va malyi ne vamwi va vachita zivi va veeza kwa Jeeso ku ku muteeka. \v 2 Voonse ma-Farasayi ne masikiriba va vaalyi ku vireera mukati kaavo, ni vati, " Wuuzu mukwaame u tambula va chita zivi, mane wulya naavo." \ No newline at end of file diff --git a/15/03.txt b/15/03.txt index fa678dc..cdc3450 100644 --- a/15/03.txt +++ b/15/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Jeeso na waamba iyi ingulyi ku vaalyi, naati, \v 4 "Njeeni kweenu, chiikuti wiina imberere zina mwaanda mmi cho ku zoveerwa imwiina ku ziri, keeti cho siya ziina makumi a maana yiyaanza ne oonne ne zimana yiyaanza ne zoone muunkaanda, mmi cho yeenda ku kusaka yiimwiina yizovete mbwiita ha ka yiwaana? \v 5 Lyinu ha ka yiwaana, u yiviika ha maheeta aakwe ne kusaanga. -======= -\v 3 Jeeso naa waamba iiyi ingui ku vaalyi, naati, \v 4 ''Njoozuhi weenu, chookuti wiina imberere ziina muyaanda kuzwaaho cho ku zooverwa iimwiina, Keeti na siiye ziina makumi a mana yiyaanza ne woonne mu muzuuka, mmi che kuyeenda ku kusaka iimwiina yiizoovete mbwiita ha ka yiwaana? \v 5 Ku zwaaho nanga chaiiwaana, cho kuiiviika ha maheeta aakwe ne ku lyitumera. ->>>>>>> f369f708cc76edac6ab2b13e50c7b61e6b75b772 +\v 3 Jeeso naa waamba iiyi ingui ku vaalyi, naati, \v 4 ''Njoozuhi weenu, chookuti wiina imberere ziina muyaanda kuzwaaho cho ku zooverwa iimwiina, Keeti na siiye ziina makumi a mana yiyaanza ne woonne mu muzuuka, mmi che kuyeenda ku kusaka iimwiina yiizoovete mbwiita ha ka yiwaana? \v 5 Ku zwaaho nanga chaiiwaana, cho kuiiviika ha maheeta aakwe ne ku lyitumera. \ No newline at end of file diff --git a/15/06.txt b/15/06.txt index 9d23d9e..d564772 100644 --- a/15/06.txt +++ b/15/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Lyinu heeza kunzuuvo, wusuumpa voonse vamwaakwe ne va zaakite naavo, wu vacho kuti, 'Musaange naame, mukuti chi naaka waana yimberere yaangu seke yizoveete.' \v 7 Ni micho kuti naangati kwiina vuulyo, ka kuve ne kusaanga kwiwulu ha kuva ne muchita zivi wumwiina hasiya zivi zaakwe, kuzaamba vaantu veena makumi a maana yiyaanza ne woonne ne ba maana yiyaanza ne voone va saa lukeere ku vakira zivi zaavo. -======= -\v 6 Choosika ku inzuvo yaakwe a va suumpi va mwaakwe ne vaazakite naavo, naa vachokuti, 'Musaange naame, mukuti ni vaa waani imberere waangu ivaa zoovete.' \v 7 Ni miicho kuti nnangaati kwiina vuulyo, ka ku kwiina kusaanga mwii wuulu muchiita ziivi umwiina haa siiya zivi zaakwe, ku zaamba vaantu veena makuumi a maana iyaanza ne woone va shiyeeme va sa suni ku siiya zivi zaavo. ->>>>>>> f369f708cc76edac6ab2b13e50c7b61e6b75b772 +\v 6 Lyinu heeza kunzuuvo, wusuumpa voonse vamwaakwe ne va zaakite naavo, wu vacho kuti, 'Musaange naame, mukuti chi naaka waana yimberere yaangu seke yizoveete.' \v 7 Ni micho kuti naangati kwiina vuulyo, ka kuve ne kusaanga kwiwulu ha kuva ne muchita zivi wumwiina hasiya zivi zaakwe, kuzaamba vaantu veena makumi a maana yiyaanza ne woonne ne ba maana yiyaanza ne voone va saa lukeere ku vakira zivi zaavo. \ No newline at end of file diff --git a/15/08.txt b/15/08.txt index db60095..648cc4c 100644 --- a/15/08.txt +++ b/15/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Kapa mukulwakazi wiina vulye wiina yiikumi lyo vuwayawaya vwe silifera, chokuti wu zooveerwa yiimwiina, ya seeti cho minika yiilaambi, ku fyeera yinzuuvo, ne ku saaka neenza mbwiita ha yiwaana? \v 9 Mmi ha yiiwaana, wusuumpa va mwaakwe haamwiina ne vaazakite naavo, naati, 'Musaange naame, mukuti na waana yiiri lyaangu seeke lyizoveete.' \v 10 Naangati kwiina vuuly, Ni mi cho kuti, kwiina kusaanga ha vusu vwa mangiloyi ee Ireeza ha muuntu umwiina yo siya zivi zaakwe." -======= -\v 8 \v 9 \v 10 Naandi mukulwaakazi iinzi wiina ikumi lyo vuwayawaya vwe isiliva,yoo uti ha a zoverwa kaa mwiina ,cho ku saa munika ilaambi , cho ku ka saka na injirikite muhupulo mbwiteeri chaa ka ka waana? ->>>>>>> f369f708cc76edac6ab2b13e50c7b61e6b75b772 +\v 8 Kapa mukulwakazi wiina vulye wiina yiikumi lyo vuwayawaya vwe silifera, chokuti wu zooveerwa yiimwiina, ya seeti cho minika yiilaambi, ku fyeera yinzuuvo, ne ku saaka neenza mbwiita ha yiwaana? \v 9 Mmi ha yiiwaana, wusuumpa va mwaakwe haamwiina ne vaazakite naavo, naati, 'Musaange naame, mukuti na waana yiiri lyaangu seeke lyizoveete.' \v 10 Naangati kwiina vuuly, Ni mi cho kuti, kwiina kusaanga ha vusu vwa mangiloyi ee Ireeza ha muuntu umwiina yo siya zivi zaakwe." \ No newline at end of file diff --git a/15/title.txt b/15/title.txt index 6deb284..474c9b1 100644 --- a/15/title.txt +++ b/15/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Ikauhaanyo 15 -======= -Ikauhanyo ya 15 ->>>>>>> f369f708cc76edac6ab2b13e50c7b61e6b75b772 +Ikauhanyo ya 15 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 3152894..19a74e4 100644 --- a/manifest.json +++ b/manifest.json @@ -65,6 +65,18 @@ "14-25", "14-28", "14-31", - "14-34" + "14-34", + "15-title", + "15-01", + "15-03", + "15-06", + "15-08", + "15-11", + "15-13", + "15-15", + "15-17", + "15-20", + "15-22", + "15-25" ] } \ No newline at end of file