From bca581cb0eb3e24988fd6a601c02ddb4e1c0b8d8 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Sat, 1 Aug 2020 11:37:13 +0300 Subject: [PATCH] Sat Aug 01 2020 11:37:12 GMT+0300 (E. Africa Standard Time) --- 05/21.txt | 6 +----- 05/23.txt | 6 +----- 05/25.txt | 6 +----- 05/27.txt | 6 +----- 05/29.txt | 6 +----- manifest.json | 6 ++++++ 6 files changed, 11 insertions(+), 25 deletions(-) diff --git a/05/21.txt b/05/21.txt index b99b44f..70a95e9 100644 --- a/05/21.txt +++ b/05/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 Anyeri ra andani eze 'jozo aini ra ri ani,'Aku'di 'ba ku,' pi 'Mo'di 'ba dire ri kesuru injwi injwi lambwa di to ra.' \v 22 Ki amajo anyini, mo'di alu alu angare 'adozi ni ni ri kesu injwi injwi le'jo lalika di to ra; ongu mo'di 'jore adozi ni,'Nyi ekwi ako!' ri kede kaka anda ga ra; onguru mo'di 'jore ,'Nyi mamali!' ri kemu kesulambwa asi aga ra. -======= -\v 21 \v 22 21Anyeri ra andani eze 'jozo aini ra ri ani,'Aku'di 'ba ku,' pi 'Mo'di 'ba dire ri kesuru injwi injwi lambwa di to ra.'22Ki amajo anyini, mo'di alu alu angare 'adozi ni ni ri kesu injwi injwi le'jo lalika di to ra; ongu mo'di 'jore adozi ni,'Nyi ekwi ako!' ri kede kaka anda ga ra; onguru mo'di 'jore ,'Nyi mamali!' ri kemu kesulambwa asi aga ra. ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +\v 21 Anyeri ra andani eze 'jozo aini ra ri ani,'Aku'di 'ba ku,' pi 'Mo'di 'ba dire ri kesuru injwi injwi lambwa di to ra.' \v 22 Ki amajo anyini, mo'di alu alu angare 'adozi ni ni ri kesu injwi injwi le'jo lalika di to ra; ongu mo'di 'jore adozi ni,'Nyi ekwi ako!' ri kede kaka anda ga ra; onguru mo'di 'jore ,'Nyi mamali!' ri kemu kesulambwa asi aga ra. \ No newline at end of file diff --git a/05/23.txt b/05/23.txt index ad839d9..99a5e74 100644 --- a/05/23.txt +++ b/05/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Disidu de nyike azi nyidi kidori okole ri ni dige ongu nyera le'jo anyini lele ga nya'dozi to 'aa , \v 24 'ebe azi nyidi kidori anda ga,nga ko nya leti.Anyiko tolu anyeko le'jo nya adozi to ati pkwa nyidi mu azi nyidi ni kere. -======= -\v 23 \v 24 23Disidu de nyike azi nyidi kidori okole ri ni dige ongu nyera le'jo anyini lele ga nya'dozi to 'aa,24'ebe azi nyidi kidori anda ga,nga ko nya leti.Anyiko tolu/anyeko le'jo nya adozi to ati pkwa nyidi mu azi nyidi ni kere. ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +\v 23 Disidu de nyike azi nyidi kidori okole ri ni dige ongu nyera le'jo anyini lele ga nya'dozi to 'aa , \v 24 'ebe azi nyidi kidori anda ga,nga ko nya leti.Anyiko tolu anyeko le'jo nya adozi to ati pkwa nyidi mu azi nyidi ni kere. \ No newline at end of file diff --git a/05/25.txt b/05/25.txt index d0c5fd0..1872f99 100644 --- a/05/25.txt +++ b/05/25.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD \v 25 Anyeriru mo'di nyini esikire ri to eze ze saa anya vo zo lokiko ga ri si, de dini ku, mo'di nyini esikire ri kuke nyi polisia a diga.ongu edu'abe -nyi mabusi aga. \v 26 Ama'jo nyini bwa bwadu, nyefu na' a si pkwe de anyolokwe mori nyidi tuwa du kuru na 'i/de anyolokwe rubia lele nyidi si ri tuwadu kuru na 'i. -======= -\v 25 \v 26 25Anyeriru mo'di nyini esikire ri to eze ze saa anya vo zo lokiko ga ri si, de dini ku, mo'di nyini esikire ri kuke nyi polisia a diga.ongu edu'abe nyi mabusi aga.26Ama'jo nyini bwa bwadu, nyefu na' a si pkwe de anyolokwe mori nyidi tuwa du kuru na 'i/de anyolokwe rubia lele nyidi si ri tuwadu kuru na 'i. ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +nyi mabusi aga. \v 26 Ama'jo nyini bwa bwadu, nyefu na' a si pkwe de anyolokwe mori nyidi tuwa du kuru na 'i/de anyolokwe rubia lele nyidi si ri tuwadu kuru na 'i. \ No newline at end of file diff --git a/05/27.txt b/05/27.txt index c5dc49a..45e8970 100644 --- a/05/27.txt +++ b/05/27.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 27 Anyeri ra, 'a 'jo,'Akede awu ku', \v 28 Ki ama'jo anyini, mo'di alu alu izi ndere vico odu kozo uku to ri si ri ede awu anda to anda ni asi aga ra. -======= -\v 27 \v 28 27 Anyeri ra, 'a 'jo,'Akede awu ku',28Ki ama'jo anyini, mo'di alu alu izi ndere vico odu kozo uku to ri si ri ede awu anda to anda ni asi aga ra. ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +\v 27 Anyeri ra, 'a 'jo,'Akede awu ku', \v 28 Ki ama'jo anyini, mo'di alu alu izi ndere vico odu kozo uku to ri si ri ede awu anda to anda ni asi aga ra. \ No newline at end of file diff --git a/05/29.txt b/05/29.txt index 637d18c..f9bc8a9 100644 --- a/05/29.txt +++ b/05/29.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 29 De nyini 'mi kalazi nyi enji edere ga ni, enge anda ni la'angwe, edu 'vi pi. Duba nya ru ni ewo alu kelegwe ni nya ru bworodu ni vika asi aga si na 'i. \v 30 De nya di anda kalazi nyi enji edere ga ni,'li anda ni pi,ongu 'vi anda ni pi.Duba nya ru ni ewo alu kelegwe ni nya ru 'borodu vika asi aga si na 'i. -======= -\v 29 \v 30 29De nyini 'mi kalazi nyi enji edere ga ni, enge anda ni la'angwe, edu 'vi pi.Duba nya ru ni ewo alu kelegwe ni nya ru bworodu ni vika asi aga si na 'i.30De nya di anda kalazi nyi enji edere ga ni,'li anda ni pi,ongu 'vi anda ni pi.Duba nya ru ni ewo alu kelegwe ni nya ru 'borodu vika asi aga si na 'i. ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +\v 29 De nyini 'mi kalazi nyi enji edere ga ni, enge anda ni la'angwe, edu 'vi pi. Duba nya ru ni ewo alu kelegwe ni nya ru bworodu ni vika asi aga si na 'i. \v 30 De nya di anda kalazi nyi enji edere ga ni,'li anda ni pi,ongu 'vi anda ni pi.Duba nya ru ni ewo alu kelegwe ni nya ru 'borodu vika asi aga si na 'i. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 51110f3..1097fda 100644 --- a/manifest.json +++ b/manifest.json @@ -84,6 +84,12 @@ "05-11", "05-13", "05-15", + "05-17", + "05-19", + "05-21", + "05-23", + "05-25", + "05-27", "06-title", "07-title", "09-title",