From d0845a299c7765235d27b5a97ecb6befd5ef1121 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Sat, 1 Aug 2020 11:49:35 +0300 Subject: [PATCH] Sat Aug 01 2020 11:49:34 GMT+0300 (E. Africa Standard Time) --- 07/21.txt | 6 +----- 07/24.txt | 6 +----- 07/26.txt | 6 +----- 07/28.txt | 6 +----- manifest.json | 5 +++++ 5 files changed, 9 insertions(+), 20 deletions(-) diff --git a/07/21.txt b/07/21.txt index 6796bfd..22454dd 100644 --- a/07/21.txt +++ b/07/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 Mo'di alu alu mani lungwere ,'Opi, Opi,' ri emu kwire opi rubu ge ri ni aga ku, tete 'ba 'le Ma' Ata ni rubu ge ri dini ede'ba ri pi kutoru ni. \v 22 Odu nasi 'ba yayadu kevo ku'jooki mani,'Opi, Opi, 'ama'jo nga emure redere andaga ri nya ru si kuru ya, amalu'do ori injwi ri pi ongu 'amede nyuma yayadu 'auzo ri nya ru si kuru ya? \v 23 Saa nasi wo medu mayua aini 'bwo 'bwo,''Madi mani anyi ku kwa! Anyi'nga mani nale,anyi 'ba nga injwi ri pi ni ede'ba ri pi!' -======= -\v 21 \v 22 \v 23 Mo'di alu alu mani lungwere ,'Opi, Opi,' ri emu kwire opi rubu ge ri ni aga ku, tete 'ba 'le Ma' Ata ni rubu ge ri dini ede'ba ri pi kutoru ni. 22Odu nasi 'ba yayadu kevo ku'jooki mani,'Opi, Opi, 'ama'jo nga emure redere andaga ri nya ru si kuru ya, amalu'do ori injwi ri pi ongu 'amede nyuma yayadu 'auzo ri nya ru si kuru ya?23Saa nasi wo medu mayua aini 'bwo 'bwo,''Madi mani anyi ku kwa!Anyi'nga mani nale,anyi 'ba nga injwi ri pi ni ede'ba ri pi!' ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +\v 21 Mo'di alu alu mani lungwere ,'Opi, Opi,' ri emu kwire opi rubu ge ri ni aga ku, tete 'ba 'le Ma' Ata ni rubu ge ri dini ede'ba ri pi kutoru ni. \v 22 Odu nasi 'ba yayadu kevo ku'jooki mani,'Opi, Opi, 'ama'jo nga emure redere andaga ri nya ru si kuru ya, amalu'do ori injwi ri pi ongu 'amede nyuma yayadu 'auzo ri nya ru si kuru ya? \v 23 Saa nasi wo medu mayua aini 'bwo 'bwo,''Madi mani anyi ku kwa! Anyi'nga mani nale,anyi 'ba nga injwi ri pi ni ede'ba ri pi!' \ No newline at end of file diff --git a/07/24.txt b/07/24.txt index 78022d5..017404c 100644 --- a/07/24.txt +++ b/07/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Disidu, mo'di alu alu le'jo madi ni erire ra, ongu 'bare 'ibu ga ra ri kolu mo'di zo anda di ni sire ira oni dige ri ani. \v 25 Ii emu 'di,vu lulu, 'oli lutu lutu emu lwe, oyo zo na okpwosi, ki zo na 'de vuru kuru, adusiku asi zo na ira dige. -======= -\v 24 \v 25 24Disidu, mo'di alu alu le'jo madi ni erire ra, ongu 'bare 'ibu ga ra ri kolu mo'di zo anda di ni sire ira/oni dige ri ani.25Ii emu 'di,vu lulu, 'oli /lutu lutu emu lwe, oyo zo na okpwosi, ki zo na 'de vuru kuru, adusiku asi zo na ira dige. ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +\v 24 Disidu, mo'di alu alu le'jo madi ni erire ra, ongu 'bare 'ibu ga ra ri kolu mo'di zo anda di ni sire ira oni dige ri ani. \v 25 Ii emu 'di,vu lulu, 'oli lutu lutu emu lwe, oyo zo na okpwosi, ki zo na 'de vuru kuru, adusiku asi zo na ira dige. \ No newline at end of file diff --git a/07/26.txt b/07/26.txt index 89d27d0..7f4c792 100644 --- a/07/26.txt +++ b/07/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Ki mo'di le'jo madi ni erire ra ongu 'bare 'ibu ge kuru ri kolu idoo mo'di mamali anda zo ni bire cinyakwi dige ti 'ani. \v 27 Ii emu 'di, vu edu lulu,'oli lutulutu to edu lwe ongu lure zo na, ongu zona 'edu 'de vuru, ongu zona ledi ka'ja ka'ja rum." -======= -\v 26 \v 27 26Ki mo'di le'jo madi ni erire ra ongu 'bare 'ibu ge kuru ri kolu /idoo mo'di mamali anda zo ni bire cinyakwi dige ti 'ani.27Ii emu 'di, vu edu lulu,'oli lutulutu to edu lwe ongu lure zo na, ongu zona 'edu 'de vuru, ongu zona ledi ka'ja ka'ja/rum." ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +\v 26 Ki mo'di le'jo madi ni erire ra ongu 'bare 'ibu ge kuru ri kolu idoo mo'di mamali anda zo ni bire cinyakwi dige ti 'ani. \v 27 Ii emu 'di, vu edu lulu,'oli lutulutu to edu lwe ongu lure zo na, ongu zona 'edu 'de vuru, ongu zona ledi ka'ja ka'ja rum." \ No newline at end of file diff --git a/07/28.txt b/07/28.txt index 851ee93..a37b953 100644 --- a/07/28.txt +++ b/07/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 De Yezu ku'jo anda keko lo'jo 'jo anda'di ra 'ba ni mundara 'auki okpwosi, \v 29 adusiku anda 'leni 'ai kalande mo'di opkwo mori to ri di ani, karania skiribia 'ai di di ani ku. -======= -\v 28 \v 29 28De Yezu ku'jo anda keko lo'jo 'jo anda'di ra 'ba ni mundara 'auki okpwosi,29adusiku anda 'leni 'ai kalande mo'di opkwo/mori to ri di ani, karania/skiribia 'ai di di ani ku. ->>>>>>> 613704aa13f0997b338ceac78517536f72e0e360 +\v 28 De Yezu ku'jo anda keko lo'jo 'jo anda'di ra 'ba ni mundara 'auki okpwosi, \v 29 adusiku anda 'leni 'ai kalande mo'di opkwo mori to ri di ani, karania skiribia 'ai di di ani ku. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 1a367b9..3ac0986 100644 --- a/manifest.json +++ b/manifest.json @@ -120,6 +120,11 @@ "07-11", "07-13", "07-15", + "07-18", + "07-21", + "07-24", + "07-26", + "07-28", "09-title", "10-19", "10-26",