From f5434c05f130ff4874e01280835dc89da04457b7 Mon Sep 17 00:00:00 2001 From: stewardd Date: Fri, 9 Mar 2018 21:15:02 +0200 Subject: [PATCH] Fri Mar 09 2018 21:15:02 GMT+0200 (South Africa Standard Time) --- 02/01.txt | 7 +------ 02/03.txt | 6 +----- 02/26.txt | 2 +- 19/title.txt | 6 +----- 21/11.txt | 6 +----- manifest.json | 1 + 6 files changed, 6 insertions(+), 22 deletions(-) diff --git a/02/01.txt b/02/01.txt index 0df0eed..b17cddb 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\c 2 \v 1 Kwi iñiloi lye keleke yina mwa maefese ñole: 'Awo njimazwi akwe uzo yokwete ikani zikwana iyaza ni zovele cheyaza lyachilyo hape yo yendenda mukati kamalambi akwana iyaza niwovele, - \v 2 ''Nizi choba pangi hape nimitendo yako ilema nikulo yako inde yaku tundamena. Nizi kuti kawi chilili batu bena chive.Nizi kuti uba tatubi abo bawamba kuti maapostola. linu kanjibona wana kuti kahena basakusima. -======= -\c 2 \v 1 Uñolele iñiloyi lye Kereke ya Sarde. Aya njimanzwi ozo yokwatilile inkani zitenda iyaza ni zobele kwiyanza lyakwe lyabulyo imi yoyenda mukati kamalambi egauda akwana iyanza ni obele, \v 2 ''Nizi zobapangi imi musebezi wako mukando ni inkulo inde yakulindila. Nizi kuti kowoli kulolelela bantu bachive. Nizi kuti ubaliki abo baliwamba kuti ba Apositola, kono nisali njibona,imi ubabawani kuti babuhata. ->>>>>>> c6facc89e4dfc755d88b2475c971f12ab4a6f187 +\c 2 \v 1 Uñolele iñiloyi lye Kereke ya Sarde. Aya njimanzwi ozo yokwatilile inkani zitenda iyaza ni zobele kwiyanza lyakwe lyabulyo imi yoyenda mukati kamalambi egauda akwana iyanza ni obele, \v 2 ''Nizi zobapangi imi musebezi wako mukando ni inkulo inde yakulindila. Nizi kuti kowoli kulolelela bantu bachive. Nizi kuti ubaliki abo baliwamba kuti ba Apositola, kono nisali njibona,imi ubabawani kuti babuhata. \ No newline at end of file diff --git a/02/03.txt b/02/03.txt index ea46564..bf6ea1d 100644 --- a/02/03.txt +++ b/02/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 \v 4 \v 5 Nizi kuti wina ikulo inde niku tundamena,hape uba sukuluki ahulu chebaka lye zina lyangu,hape kana ubasiki haku sutika.Kono kwina chini kulwisa kacho busakusima ubasiyi kumasule irato lyako lyetazi.Zeze linuaho kobawi.Ubake imi utende zitu zoba kupanga lwetazi.Konji chi wabaka,Kanize kwako imi kanize nishimbulule ilambi lyako muchibaka chalyo. -======= -\v 3 Nizi kuti wina inkulo inde yakulindila, imi ubanyandi maswe chebaka lyezina lyangu, imi kena ubakatali. \v 4 Kono nikubengelele kuchokuti ubasiyi kumasule ilato lyako lyetanzi. \v 5 Uzeze chobulyo kukazwilila hobakawili. Ubakele zive imi utatike kutende zintu zobatatiki kwitazi. Konji chiwabakela zive, Kanikeze kwako imi kanizwise mekalilo amalambi hazikalilo zateni. ->>>>>>> c6facc89e4dfc755d88b2475c971f12ab4a6f187 +\v 3 Nizi kuti wina inkulo inde yakulindila, imi ubanyandi maswe chebaka lyezina lyangu, imi kena ubakatali. \v 4 Kono nikubengelele kuchokuti ubasiyi kumasule ilato lyako lyetanzi. \v 5 Uzeze chobulyo kukazwilila hobakawili. Ubakele zive imi utatike kutende zintu zobatatiki kwitazi. Konji chiwabakela zive, Kanikeze kwako imi kanizwise mekalilo amalambi hazikalilo zateni. \ No newline at end of file diff --git a/02/26.txt b/02/26.txt index 932aee2..057a869 100644 --- a/02/26.txt +++ b/02/26.txt @@ -1 +1 @@ -\v 26 \v 28 \v 29 Iye mwine yozunda hape natenda zinali kutenda kuka sika kuma maninizo, kani muhe itukelo hewulu lyechisi. \v 27 Mwa ba buse ke nkoli yesipi, Sina tuhambwe twelongo mwaba pwachole bufwafwali. ' Sina muniba tambwili kwaTayo,Name muni muhe ikani ya lilungwe. Musiye wina matwi atekeleze chilu wamba Luhuho kwi kereke.''''' \ No newline at end of file +\v 26 Iye mwine yozunda hape natenda zinali kutenda kuka sika kuma maninizo, kani muhe itukelo hewulu lyechisi. \v 27 Mwa ba buse ke nkoli yesipi, Sina tuhambwe twelongo mwaba pwachole bufwafwali. ' \v 28 Sina muniba tambwili kwaTayo,Name muni muhe ikani ya lilungwe. \v 29 Musiye wina matwi atekeleze chilu wamba Luhuho kwi kereke.''''' \ No newline at end of file diff --git a/19/title.txt b/19/title.txt index 17a2ecb..d345e03 100644 --- a/19/title.txt +++ b/19/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Inkauhanyo ya 19 -======= -Inkauhanyo 19 ->>>>>>> 939a81c535448be8e90eb3f6f235df99c079a074 +Inkauhanyo 19 \ No newline at end of file diff --git a/21/11.txt b/21/11.txt index 94bed0e..34b963e 100644 --- a/21/11.txt +++ b/21/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Jerusalema ibene ikanya ya Ireeza, imi iseli lyateni libenya sina ibwe lyabutokwa, sina ibwe lyajaspe libelela sina kristal. \v 12 Ubikitwe mulukwakwa lukando lule kwina milyango ikwana ikumi ni yobele, ni mañiloi akwana ikumi niwobele. Imi hamilwango habañoletwe mazina abana ba Isilaele akwana ikumi ni wobele. \v 13 -======= -\v 11 \v 12 \v 13 Kubuzwe kubena milyango yotatwe, mutulo, milyango yotatwe, mbowela milyango yotatwe, nikwawiko yotatwe milyango. ->>>>>>> 939a81c535448be8e90eb3f6f235df99c079a074 +\v 11 Jerusalema ibene ikanya ya Ireeza, imi iseli lyateni libenya sina ibwe lyabutokwa, sina ibwe lyajaspe libelela sina kristal. \v 12 Ubikitwe mulukwakwa lukando lule kwina milyango ikwana ikumi ni yobele, ni mañiloi akwana ikumi niwobele. Imi hamilwango habañoletwe mazina abana ba Isilaele akwana ikumi ni wobele. \v 13 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 3102f69..53e07cf 100644 --- a/manifest.json +++ b/manifest.json @@ -61,6 +61,7 @@ "02-20", "02-22", "02-24", + "02-26", "03-title", "03-01", "03-03",