From 92d0d2604e50a23ac050ecbdf75cab790d16bd31 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Sat, 1 Aug 2020 12:17:03 +0300 Subject: [PATCH] Sat Aug 01 2020 12:17:02 GMT+0300 (E. Africa Standard Time) --- 10/05.txt | 6 +----- 10/08.txt | 6 +----- 10/11.txt | 6 +----- 10/14.txt | 6 +----- 10/16.txt | 6 +----- 10/19.txt | 2 +- manifest.json | 7 ++++++- 7 files changed, 12 insertions(+), 27 deletions(-) diff --git a/10/05.txt b/10/05.txt index 2786420..22a9376 100644 --- a/10/05.txt +++ b/10/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Yezu zwe ma'ju mudi a limbi eri di pi la'angwe.Edu ecara 'ai ni, "Anyivo 'ba Judei'ba ku ri pi a olure ga ku, ongu anyitoru tauni/ganyi Samarita'ba di ni aga ku. \v 6 Ra ri anyivo bilo legwere di Isaraili ni zo ga si ri pi di; bilo Isaraili di legwere di ri pi di; \v 7 anya vore ga, anyinge anyiyu anyi'jo anyico,'Opi rubu di esa wo ire.' -======= -\v 5 \v 6 \v 7 5 Yezu zwe ma'ju mudi a limbi eri di pi la'angwe.Edu ecara 'ai ni, "Anyivo 'ba Judei'ba ku ri pi a olure ga ku, ongu anyitoru tauni/ganyi Samarita'ba di ni aga ku. 6Ra ri anyivo bilo legwere di Isaraili ni zo ga si ri pi di;/ bilo Isaraili di legwere di ri pi di;7anya vore ga, anyinge/ anyiyu/anyi'jo/anyico,'Opi rubu di esa wo ire.' ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +\v 5 Yezu zwe ma'ju mudi a limbi eri di pi la'angwe.Edu ecara 'ai ni, "Anyivo 'ba Judei'ba ku ri pi a olure ga ku, ongu anyitoru tauni/ganyi Samarita'ba di ni aga ku. \v 6 Ra ri anyivo bilo legwere di Isaraili ni zo ga si ri pi di; bilo Isaraili di legwere di ri pi di; \v 7 anya vore ga, anyinge anyiyu anyi'jo anyico,'Opi rubu di esa wo ire.' \ No newline at end of file diff --git a/10/08.txt b/10/08.txt index 1a3732c..5ad49c6 100644 --- a/10/08.txt +++ b/10/08.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD \v 8 Anye'bwe 'ba ru injwi ri pi, anye'nga 'ba oda'ba ra ri pi, anyi'ba dobo'ba kecoru okole, anyuludo ori injwi ri pi. Anya esuzo isa ri ani, kulee anyike issa. \v 9 Akuzi mula suba su ri anya kubegu aga ku. \v 10 Akuzi kubegu awe di, bungu bongu ecozo ri , mvuka mvuka ecozo ri bele to anya vore ga si ku, adusiku ibure a dide duba kolu 'a a/ mo'di ibu edere ri kule -kesu anda dide. -======= -\v 8 \v 9 \v 10 8 Anye'bwe 'ba ru injwi ri pi, anye'nga 'ba oda'ba ra ri pi, anyi'ba dobo'ba kecoru okole, anyuludo ori injwi ri pi. Anya esuzo isa ri ani, kulee anyike issa.9 Akuzi mula suba su ri anya kubegu aga ku.10 Akuzi kubegu awe di, bungu bongu ecozo ri , mvuka mvuka ecozo ri bele to anya vore ga si ku, adusiku ibure a dide duba kolu 'a a/ mo'di ibu edere ri kule kesu anda dide. ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +kesu anda dide. \ No newline at end of file diff --git a/10/11.txt b/10/11.txt index a9d72c1..7e720f2 100644 --- a/10/11.txt +++ b/10/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Ba kusa ganyi alu alu anya rutore ga ri ni aga, anyindu mo'di laru to na 'i, anyolu na a bwi odu anya ngazo ri ni nga. \v 12 Anyike lazi saa anya ruto zo zuga ri si.` \v 13 De zo na esi 'ca, anye'be ibwe anyidi kesi laka. Ki de esi ku, anye'be ibwe anyidi kengwi anyidi. -======= -\v 11 \v 12 \v 13 11'Ba kusa ganyi alu alu anya rutore ga ri ni aga, anyindu mo'di laru to na 'i, anyolu na a bwi odu anya ngazo ri ni nga.12Anyike lazi saa anya ruto zo zuga ri si.`3 De zo na esi 'ca, anye'be ibwe anyidi kesi laka. Ki de esi ku, anye'be ibwe anyidi kengwi anyidi. ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +\v 11 Ba kusa ganyi alu alu anya rutore ga ri ni aga, anyindu mo'di laru to na 'i, anyolu na a bwi odu anya ngazo ri ni nga. \v 12 Anyike lazi saa anya ruto zo zuga ri si.` \v 13 De zo na esi 'ca, anye'be ibwe anyidi kesi laka. Ki de esi ku, anye'be ibwe anyidi kengwi anyidi. \ No newline at end of file diff --git a/10/14.txt b/10/14.txt index adea5dd..7956894 100644 --- a/10/14.txt +++ b/10/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Ba anyini 'ai'ba ku, kusa le'jo anyidi ni eri'ba ku ri pi ni, de anye'be zo kusa tauni na, anyulutu futu anyini pa ga 'ai ni. \v 15 Adusiku ama'jo anyini bwa bwadu, duba na kolu vu Sodomu pi di Gomora to ri ni odu le'jo lali zo ri ra, vu na pi ni si na 'i. -======= -\v 14 \v 15 14'Ba anyini 'ai'ba ku, kusa le'jo anyidi ni eri'ba ku ri pi ni, de anye'be zo kusa tauni na, anyulutu futu anyini pa ga 'ai ni.15 Adusiku ama'jo anyini bwa bwadu, duba na kolu vu Sodomu pi di Gomora to ri ni odu le'jo lali zo ri ra, vu na pi ni si na 'i. ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +\v 14 Ba anyini 'ai'ba ku, kusa le'jo anyidi ni eri'ba ku ri pi ni, de anye'be zo kusa tauni na, anyulutu futu anyini pa ga 'ai ni. \v 15 Adusiku ama'jo anyini bwa bwadu, duba na kolu vu Sodomu pi di Gomora to ri ni odu le'jo lali zo ri ra, vu na pi ni si na 'i. \ No newline at end of file diff --git a/10/16.txt b/10/16.txt index 78736b9..2fe1866 100644 --- a/10/16.txt +++ b/10/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 Anyinde, ma'zwe anyi kalande bilo zwe zo moi kidi kidi ni laki aga ri ani, disidu anyolu ciri ini ani ongu ibwe amamu ani. \v 17 Anyekuka anyi 'ba siKuke ki anyi 'ba aia vu ni le'jo lu'jo'ba ri pi di, kedu kulu 'mbwaki anyi sinagoga vura ni zo elegi ni zo aidi ni a si. \v 18 Vu na ni ga, edu ezi anyi ba vu lase'ba ri pi ni anda ga opi to le'jo madi si a'i ni sadeni du 'ba Rubanga ni ni'ba ku ri pi ni to kafiria ni to. -======= -\v 16 \v 17 \v 18 16Anyinde, ma'zwe anyi kalande bilo zwe zo moi kidi kidi ni laki aga ri ani, disidu anyolu ciri ini ani ongu ibwe amamu ani.17 Anyekuka anyi 'ba si!Kuke ki anyi 'ba aia vu ni le'jo lu'jo'ba ri pi di, kedu kulu'mbwaki anyi sinagoga/vura ni zo/elegi ni zo aidi ni a si.18 Vu na ni ga, edu ezi anyi ba vu lase'ba ri pi ni anda ga opi to le'jo madi si a'i ni sadeni du 'ba Rubanga ni ni'ba ku ri pi ni to/ kafiria ni to. ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +\v 16 Anyinde, ma'zwe anyi kalande bilo zwe zo moi kidi kidi ni laki aga ri ani, disidu anyolu ciri ini ani ongu ibwe amamu ani. \v 17 Anyekuka anyi 'ba siKuke ki anyi 'ba aia vu ni le'jo lu'jo'ba ri pi di, kedu kulu 'mbwaki anyi sinagoga vura ni zo elegi ni zo aidi ni a si. \v 18 Vu na ni ga, edu ezi anyi ba vu lase'ba ri pi ni anda ga opi to le'jo madi si a'i ni sadeni du 'ba Rubanga ni ni'ba ku ri pi ni to kafiria ni to. \ No newline at end of file diff --git a/10/19.txt b/10/19.txt index 6c39283..1d5185e 100644 --- a/10/19.txt +++ b/10/19.txt @@ -1 +1 @@ -\v 19 \v 20 19 De kuziki anyi lokiko ga, anyi ni asidi kulumvuru ku anyevo anyi'jo adu si ya 'i, adusiku nga anyini 'jole ri kukeru anyini saa na si ra.20Adusiku anyevo anyolo'joru anyi 'i ku, ki endi anya Ata di kemu kolo'joru anyi ni aga si ni. \ No newline at end of file +\v 19 19 De kuziki anyi lokiko ga, anyi ni asidi kulumvuru ku anyevo anyi'jo adu si ya 'i, adusiku nga anyini 'jole ri kukeru anyini saa na si \v 20 ra. 20Adusiku anyevo anyolo'joru anyi 'i ku, ki endi anya Ata di kemu kolo'joru anyi ni aga si ni. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 2a5fb6a..581daba 100644 --- a/manifest.json +++ b/manifest.json @@ -160,7 +160,12 @@ "09-37", "10-title", "10-01", - "10-19", + "10-02", + "10-05", + "10-08", + "10-11", + "10-14", + "10-16", "10-26", "10-32", "10-34",