From b91fcf3090c3eead7e45a5b12f2f199d7fee97ba Mon Sep 17 00:00:00 2001 From: parfait-ayanou Date: Wed, 1 Jul 2020 10:06:01 -0400 Subject: [PATCH] Wed Jul 01 2020 10:06:01 GMT-0400 (EDT) --- 05/09.txt | 6 +----- 05/12.txt | 6 +----- 06/01.txt | 6 +----- 06/07.txt | 6 +----- 06/13.txt | 6 +----- 06/19.txt | 6 +----- 06/title.txt | 6 +----- 07/01.txt | 6 +----- 07/04.txt | 6 +----- 07/title.txt | 2 +- 08/01.txt | 6 +----- 08/03.txt | 6 +----- manifest.json | 2 ++ 13 files changed, 14 insertions(+), 56 deletions(-) diff --git a/05/09.txt b/05/09.txt index cfdcd03..94385f4 100644 --- a/05/09.txt +++ b/05/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Eye, eyi o dui ɖedji vɔ megbea, e ʒũ ɖeɖekpɔkpɔ mavɔ be tatɔ ne ame yiwo kpata ne ɖo na toui a. \v 10 Mawu ɖe gblõ be nyi vɔsalagă le Melchisedek be ɖoɖoa nu. \v 11 Nu sugbõ le yi mia gblõ kuɖe eŋti, ye o le nuseŋ ne mia ɖewo gõme, ɖo nuyi ŋtia mi me teŋ sena nuwo gõme kakao. -======= -\v 9 Eye, eyi o dui ɖedji vɔ megbea, e ʒũ ɖeɖekpɔkpɔ mavɔ be tatɔ ne ame yiwo kpata ne ɖo na toui a. \v 10 Mawu ɖe gblõ be nyi vɔsalagă le Melchisedek be ɖoɖoa nu. \v 11 Nu sugbõ le yi mia gblõ kuɖe eŋti, ye o le nuseŋ ne mia ɖewo gõme, ɖo nuyi ŋtia mi me teŋ sena nuwo gõme kakao. ->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c +\v 9 Eye, eyi o dui ɖedji vɔ megbea, e ʒũ ɖeɖekpɔkpɔ mavɔ be tatɔ ne ame yiwo kpata ne ɖo na toui a. \v 10 Mawu ɖe gblõ be nyi vɔsalagă le Melchisedek be ɖoɖoa nu. \v 11 Nu sugbõ le yi mia gblõ kuɖe eŋti, ye o le nuseŋ ne mia ɖewo gõme, ɖo nuyi ŋtia mi me teŋ sena nuwo gõme kakao. \ No newline at end of file diff --git a/05/12.txt b/05/12.txt index 221398f..2eff8eb 100644 --- a/05/12.txt +++ b/05/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Le yăteƒemea, mia woe ɖo la ke nyi nuƒiõlawoa xoxo, mi. gba kpɔtɔ li hiă be woa gba ƒiõ mi Mawu be gõme djedje. nuwo, eye mi ʒũ me yiwo gba hiă nɔci, menyi nuɖuɖu sɛũ o. \v 13 Vɔ benyibe, me ɖekpekpe yi le nɔci noma, me ɖo djɔdjɔɛnyenye be nya be numetoto o; do nuyi ŋtia vivi be nyi. \v 14 Vɔ nuɖuɖu sẽũa nyi ame ciciwo tɔ, ame yiwo ke, võnudɔdrõ oɖokui ma wo, yi o dona djesi nu nyui ku nuvõ. -======= -\v 12 Le yăteƒemea, mia woe ɖo la ke nyi nuƒiõlawoa xoxo, mi. gba kpɔtɔ li hiă be woa gba ƒiõ mi Mawu be gõme djedje. nuwo, eye mi ʒũ me yiwo gba hiă nɔci, menyi nuɖuɖu sɛũ o. \v 13 Vɔ benyibe, me ɖekpekpe yi le nɔci noma, me ɖo djɔdjɔɛnyenye be nya be numetoto o; do nuyi ŋtia vivi be nyi. \v 14 Vɔ nuɖuɖu sẽũa nyi ame ciciwo tɔ, ame yiwo ke, võnudɔdrõ oɖokui ma wo, yi o dona djesi nu nyui ku nuvõ. ->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c +\v 12 Le yăteƒemea, mia woe ɖo la ke nyi nuƒiõlawoa xoxo, mi. gba kpɔtɔ li hiă be woa gba ƒiõ mi Mawu be gõme djedje. nuwo, eye mi ʒũ me yiwo gba hiă nɔci, menyi nuɖuɖu sɛũ o. \v 13 Vɔ benyibe, me ɖekpekpe yi le nɔci noma, me ɖo djɔdjɔɛnyenye be nya be numetoto o; do nuyi ŋtia vivi be nyi. \v 14 Vɔ nuɖuɖu sẽũa nyi ame ciciwo tɔ, ame yiwo ke, võnudɔdrõ oɖokui ma wo, yi o dona djesi nu nyui ku nuvõ. \ No newline at end of file diff --git a/06/01.txt b/06/01.txt index 0fecea6..eb425fe 100644 --- a/06/01.txt +++ b/06/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 6 \v 1 Numa ŋti, mi ne ɖasi le kristo be nya be gɔmedjenuwo ŋti, ne mia kuɖe blibonyenye ŋti, yi mi ma gba ɖo nugbegbe le dɔwɔ na kukuwo ŋti. \v 2 Xɔse ɖoɖo ɖe Mawu dji, nyɔnyvɔwo be be nuƒiɔfiɔ,asiwo dada ɖeame dji, ame kukuwo be citre cici co yɔdome gaku võnudɔdrɔ mavɔ mavɔ be gɔmeɖoɖo anyi ko. \v 3 Nu yɔ woanyi nuyiwɔ wɔm mianɔ ne Mawu ɖemɔa. -======= -\v 1 Numa ŋti, mi ne ɖasi le kristo be nya be gɔmedjenuwo ŋti, ne mia kuɖe blibonyenye ŋti, yi mi ma gba ɖo nugbegbe le dɔwɔ na kukuwo ŋti. \v 2 Xɔse ɖoɖo ɖe Mawu dji, nyɔnyvɔwo be be nuƒiɔfiɔ,asiwo dada ɖeame dji, ame kukuwo be citre cici co yɔdome gaku võnudɔdrɔ mavɔ mavɔ be gɔmeɖoɖo anyi ko. \v 3 Nu yɔ woanyi nuyiwɔ wɔm mianɔ ne Mawu ɖemɔa. ->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c +\c 6 \v 1 Numa ŋti, mi ne ɖasi le kristo be nya be gɔmedjenuwo ŋti, ne mia kuɖe blibonyenye ŋti, yi mi ma gba ɖo nugbegbe le dɔwɔ na kukuwo ŋti. \v 2 Xɔse ɖoɖo ɖe Mawu dji, nyɔnyvɔwo be be nuƒiɔfiɔ,asiwo dada ɖeame dji, ame kukuwo be citre cici co yɔdome gaku võnudɔdrɔ mavɔ mavɔ be gɔmeɖoɖo anyi ko. \v 3 Nu yɔ woanyi nuyiwɔ wɔm mianɔ ne Mawu ɖemɔa. \ No newline at end of file diff --git a/06/07.txt b/06/07.txt index 787687c..0752e6f 100644 --- a/06/07.txt +++ b/06/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Ne anyigbă ɖe nuna eci nyuiɖe to eci djadja yi ne nɔna djadja kɔɖe edji ye be miɔna gbe yi ame yiwo ne dea woa ʒã, Mawu be yaya be nyi; \v 8 vɔ, nenyi be aŋũdja ku be miɔa, eʒu ʋlodonu , yoƒi woa ƒo de, ye le nuwuwu, edjo kpo woa tɔɛ. -======= -\v 7 Ne anyigbă ɖe nuna eci nyuiɖe to eci djadja yi ne nɔna djadja kɔɖe edji ye be miɔna gbe yi ame yiwo ne dea woa ʒã, Mawu be yaya be nyi; \v 8 vɔ, nenyi be aŋũdja ku be miɔa, eʒu ʋlodonu , yoƒi woa ƒo de, ye le nuwuwu, edjo kpo woa tɔɛ. ->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c +\v 7 Ne anyigbă ɖe nuna eci nyuiɖe to eci djadja yi ne nɔna djadja kɔɖe edji ye be miɔna gbe yi ame yiwo ne dea woa ʒã, Mawu be yaya be nyi; \v 8 vɔ, nenyi be aŋũdja ku be miɔa, eʒu ʋlodonu , yoƒi woa ƒo de, ye le nuwuwu, edjo kpo woa tɔɛ. \ No newline at end of file diff --git a/06/13.txt b/06/13.txt index b67614a..4562bbb 100644 --- a/06/13.txt +++ b/06/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Ke Mawu do ŋgbe ne Abrahaũă, yi me kpɔ ame yi lolo wi ne ba ta owoa, e to yiŋtɔ ɖokui, ye be gblɔbe. \v 14 Yă teƒemea, ma yraɔ ye ma dji djidjime wɔa ɖedji. \v 15 Eye yi Abraham do vevi nu enea, ŋgbedodo me cɔnuwo sũ esi. -======= -\v 13 Ke Mawu do ŋgbe ne Abrahaũă, yi me kpɔ ame yi lolo wi ne ba ta owoa, e to yiŋtɔ ɖokui, ye be gblɔbe. \v 14 Yă teƒemea, ma yraɔ ye ma dji djidjime wɔa ɖedji. \v 15 Eye yi Abraham do vevi nu enea, ŋgbedodo me cɔnuwo sũ esi. ->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c +\v 13 Ke Mawu do ŋgbe ne Abrahaũă, yi me kpɔ ame yi lolo wi ne ba ta owoa, e to yiŋtɔ ɖokui, ye be gblɔbe. \v 14 Yă teƒemea, ma yraɔ ye ma dji djidjime wɔa ɖedji. \v 15 Eye yi Abraham do vevi nu enea, ŋgbedodo me cɔnuwo sũ esi. \ No newline at end of file diff --git a/06/19.txt b/06/19.txt index ae14c2b..49f82fc 100644 --- a/06/19.txt +++ b/06/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 Mɔkpɔkpɔ ma, mi ɖui sigbe be luʋõ be seke ene, e le dedjinonome eye ne like goŋgoŋ e ŋõ avɔa dje egodo, \v 20 teƒe yi Yesu yi ɖe mia to sigbe ŋkɔdjetɔ ene, ame ke o ɖui vosala nɔɖokui si seyiɖa le Melchisédek be ɖoɖoa nu. -======= -\v 19 Mɔkpɔkpɔ ma, mi ɖui sigbe be luʋõ be seke ene, e le dedjinonome eye ne like goŋgoŋ e ŋõ avɔa dje egodo, \v 20 teƒe yi Yesu yi ɖe mia to sigbe ŋkɔdjetɔ ene, ame ke o ɖui vosala nɔɖokui si seyiɖa le Melchisédek be ɖoɖoa nu. ->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c +\v 19 Mɔkpɔkpɔ ma, mi ɖui sigbe be luʋõ be seke ene, e le dedjinonome eye ne like goŋgoŋ e ŋõ avɔa dje egodo, \v 20 teƒe yi Yesu yi ɖe mia to sigbe ŋkɔdjetɔ ene, ame ke o ɖui vosala nɔɖokui si seyiɖa le Melchisédek be ɖoɖoa nu. \ No newline at end of file diff --git a/06/title.txt b/06/title.txt index e0303f2..44cb251 100644 --- a/06/title.txt +++ b/06/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -ETA 6 -======= -ETA 6 ->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c +ETA 6 \ No newline at end of file diff --git a/07/01.txt b/07/01.txt index 00b0d9c..c773e58 100644 --- a/07/01.txt +++ b/07/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 7 \v 1 Le yăteƒeme, Melchisédek ya, Salem be ƒiɔ, vɔsato ne Mawu de dji, ame yi , va yi dogo. Abraham le eyi beyi ɖu eƒiɔwo dji trɔ gbɔ̃ nɔa, e yraɛ, \v 2 eye ame yi Abraham tsɔ nuwo kpata be ewogɔ̃ na, do ŋkua, e nyĩ djɔdjɔɛ nye nye be ƒiɔ, le yibe nyikɔa be gɔ̃me sese nu, ye be gba nyĩ Salem be ƒiɔ, yi gɔ̃ me nyĩ nuciƒaƒa be ƒiɔ, \v 3 ame yi tɔtɔ mele sio, nɔ̃ mele, sio djidjime mele sio, ameyi meɖo nuwuwu nagbea o, vɔ eɖi Mawu be via, Melchisedek ma nyĩ̃ vɔsatɔ yi maʋɔmavɔme. -======= -\v 1 Le yăteƒeme, Melchisédek ya, Salem be ƒiɔ, vɔsato ne Mawu de dji, ame yi , va yi dogo. Abraham le eyi beyi ɖu eƒiɔwo dji trɔ gbɔ̃ nɔa, e yraɛ, \v 2 eye ame yi Abraham tsɔ nuwo kpata be ewogɔ̃ na, do ŋkua, e nyĩ djɔdjɔɛ nye nye be ƒiɔ, le yibe nyikɔa be gɔ̃me sese nu, ye be gba nyĩ Salem be ƒiɔ, yi gɔ̃ me nyĩ nuciƒaƒa be ƒiɔ, \v 3 ame yi tɔtɔ mele sio, nɔ̃ mele, sio djidjime mele sio, ameyi meɖo nuwuwu nagbea o, vɔ eɖi Mawu be via, Melchisedek ma nyĩ̃ vɔsatɔ yi maʋɔmavɔme. ->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c +\c 7 \v 1 Le yăteƒeme, Melchisédek ya, Salem be ƒiɔ, vɔsato ne Mawu de dji, ame yi , va yi dogo. Abraham le eyi beyi ɖu eƒiɔwo dji trɔ gbɔ̃ nɔa, e yraɛ, \v 2 eye ame yi Abraham tsɔ nuwo kpata be ewogɔ̃ na, do ŋkua, e nyĩ djɔdjɔɛ nye nye be ƒiɔ, le yibe nyikɔa be gɔ̃me sese nu, ye be gba nyĩ Salem be ƒiɔ, yi gɔ̃ me nyĩ nuciƒaƒa be ƒiɔ, \v 3 ame yi tɔtɔ mele sio, nɔ̃ mele, sio djidjime mele sio, ameyi meɖo nuwuwu nagbea o, vɔ eɖi Mawu be via, Melchisedek ma nyĩ̃ vɔsatɔ yi maʋɔmavɔme. \ No newline at end of file diff --git a/07/04.txt b/07/04.txt index abf4ad7..91d8a25 100644 --- a/07/04.txt +++ b/07/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Miɔŋtɔ mi bu lolome kpɔ ne ame yi mia tɔgbui Abraham cɔ aboyo nu yiwo be hegbɔ be teƒe ewogɔ̃a na kpɖa. \v 5 Le sea nua, Lewiviviyiwo dometɔ ɖewo xɔ vɔsatɔnyinyia, ese le wocă wosi be woanɔ enuwo be teƒe ewogɔ̌ǎ xɔ̌ le dukɔ̃a si, yi gɔ̃me nyi be, woa xɔ enuwo be ewogɔ̃̃a le wo nɔʋiwo si, meyiwo Abraham be alitomeʋi kpo wo că wonyi; \v 6 Ye ame ma yi me do co woame o wɔa, xɔ enuwo be teƒe ewogɔ̃a la Abraham si, ye be yra meyi si ŋgbedodowo lea. -======= -\v 4 Miɔŋtɔ mi bu lolome kpɔ ne ame yi mia tɔgbui Abraham cɔ aboyo nu yiwo be hegbɔ be teƒe ewogɔ̃a na kpɖa. \v 5 Le sea nua, Lewiviviyiwo dometɔ ɖewo xɔ vɔsatɔnyinyia, ese le wocă wosi be woanɔ enuwo be teƒe ewogɔ̌ǎ xɔ̌ le dukɔ̃a si, yi gɔ̃me nyi be, woa xɔ enuwo be ewogɔ̃̃a le wo nɔʋiwo si, meyiwo Abraham be alitomeʋi kpo wo că wonyi; \v 6 Ye ame ma yi me do co woame o wɔa, xɔ enuwo be teƒe ewogɔ̃a la Abraham si, ye be yra meyi si ŋgbedodowo lea. ->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c +\v 4 Miɔŋtɔ mi bu lolome kpɔ ne ame yi mia tɔgbui Abraham cɔ aboyo nu yiwo be hegbɔ be teƒe ewogɔ̃a na kpɖa. \v 5 Le sea nua, Lewiviviyiwo dometɔ ɖewo xɔ vɔsatɔnyinyia, ese le wocă wosi be woanɔ enuwo be teƒe ewogɔ̌ǎ xɔ̌ le dukɔ̃a si, yi gɔ̃me nyi be, woa xɔ enuwo be ewogɔ̃̃a le wo nɔʋiwo si, meyiwo Abraham be alitomeʋi kpo wo că wonyi; \v 6 Ye ame ma yi me do co woame o wɔa, xɔ enuwo be teƒe ewogɔ̃a la Abraham si, ye be yra meyi si ŋgbedodowo lea. \ No newline at end of file diff --git a/07/title.txt b/07/title.txt index 0d64072..128f7e2 100644 --- a/07/title.txt +++ b/07/title.txt @@ -1 +1 @@ -ETA 7 \ No newline at end of file +Eta 7 \ No newline at end of file diff --git a/08/01.txt b/08/01.txt index 0c74823..fb8c55e 100644 --- a/08/01.txt +++ b/08/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 8 \v 1 Nu yiwo mi gblɔ̃ ya be tomeci, ye nyi be vɔsatɔ nɔɖokuisi ya tɔŋgbe le miasi, bɔbɔ nɔnyi le djipo bubu ƒiɔʒkpui be ɖusilɔ me le djipo ŋtówóme. \v 2 Sigbe kɔkɔɛƒe gbadɔ yi Aƒetɔa cu menyi eyi amegbetɔ cu o be dɔcɔvi. -======= -\v 1 Nu yiwo mi gblɔ̃ ya be tomeci, ye nyi be vɔsatɔ nɔɖokuisi ya tɔŋgbe le miasi, bɔbɔ nɔnyi le djipo bubu ƒiɔʒkpui be ɖusilɔ me le djipo ŋtówóme. \v 2 Sigbe kɔkɔɛƒe gbadɔ yi Aƒetɔa cu menyi eyi amegbetɔ cu o be dɔcɔvi. a ->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c +\c 8 \v 1 Nu yiwo mi gblɔ̃ ya be tomeci, ye nyi be vɔsatɔ nɔɖokuisi ya tɔŋgbe le miasi, bɔbɔ nɔnyi le djipo bubu ƒiɔʒkpui be ɖusilɔ me le djipo ŋtówóme. \v 2 Sigbe kɔkɔɛƒe gbadɔ yi Aƒetɔa cu menyi eyi amegbetɔ cu o be dɔcɔvi. a \ No newline at end of file diff --git a/08/03.txt b/08/03.txt index eb93f5b..142eddb 100644 --- a/08/03.txt +++ b/08/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -a \v 3 ó ɖO vɔatɔ găwo ɖesiae anyi be woa nɔ̃ nunanawo gaku nũme vɔsanuwo cɔ̃ŋ ʋa; ƒiyi be hiă le veviɖe be ame ya ca ɖó laɖo nuɖe yi ba heă va savɔa. \v 4 Ne anyigbădji be ke oo a, manyĩ vɔsatɔ ŋtɔ căo, ɖoa avɔsatɔ yiwo cɔ na nunanawo ʋa na le sea nua oli vɔ. \v 5 Ameyiwo wɔna subɔ subɔ, yi nyĩ kpɔɖeũ gaku vɔ̃vɔ̃li ne djipo nuwo, le nɔnɔ me cu nu Mawu ɖe ƒiɔ̃ Mose gɛme be dja cu agbadɔa: kpɔɛ nyuiɖe, neneao gblɔ̃ɛ ne ema, be na wɔɛ le nɔnɔme cucu nu o cɔɛ ƒiõ le tóa djia nũ. -======= -\v 3 ó ɖO vɔatɔ găwo ɖesiae anyi be woa nɔ̃ nunanawo gaku nũme vɔsanuwo cɔ̃ŋ ʋa; ƒiyi be hiă le veviɖe be ame ya ca ɖó laɖo nuɖe yi ba heă va savɔa. \v 4 Ne anyigbădji be ke oo a, manyĩ vɔsatɔ ŋtɔ căo, ɖoa avɔsatɔ yiwo cɔ na nunanawo ʋa na le sea nua oli vɔ. \v 5 Ameyiwo wɔna subɔ subɔ, yi nyĩ kpɔɖeũ gaku vɔ̃vɔ̃li ne djipo nuwo, le nɔnɔ me cu nu Mawu ɖe ƒiɔ̃ Mose gɛme be dja cu agbadɔa: kpɔɛ nyuiɖe, neneao gblɔ̃ɛ ne ema, be na wɔɛ le nɔnɔme cucu nu o cɔɛ ƒiõ le tóa djia nũ. ->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c +\v 3 ó ɖO vɔatɔ găwo ɖesiae anyi be woa nɔ̃ nunanawo gaku nũme vɔsanuwo cɔ̃ŋ ʋa; ƒiyi be hiă le veviɖe be ame ya ca ɖó laɖo nuɖe yi ba heă va savɔa. \v 4 Ne anyigbădji be ke oo a, manyĩ vɔsatɔ ŋtɔ căo, ɖoa avɔsatɔ yiwo cɔ na nunanawo ʋa na le sea nua oli vɔ. \v 5 Ameyiwo wɔna subɔ subɔ, yi nyĩ kpɔɖeũ gaku vɔ̃vɔ̃li ne djipo nuwo, le nɔnɔ me cu nu Mawu ɖe ƒiɔ̃ Mose gɛme be dja cu agbadɔa: kpɔɛ nyuiɖe, neneao gblɔ̃ɛ ne ema, be na wɔɛ le nɔnɔme cucu nu o cɔɛ ƒiõ le tóa djia nũ. \ No newline at end of file diff --git a/manifest.json b/manifest.json index ab1f56c..6ae0788 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,9 @@ "06-09", "06-11", "06-16", + "06-19", "07-title", + "07-04", "07-07", "07-11", "07-13",