From 3004314eb9a768423192fc6401edd86565ebbfc6 Mon Sep 17 00:00:00 2001 From: ATCHAMADO_BEN Date: Fri, 17 Sep 2021 10:24:56 +0200 Subject: [PATCH] =?UTF-8?q?Fri=20Sep=2017=202021=2010:24:55=20GMT+0200=20(?= =?UTF-8?q?Paris,=20Madrid=20(heure=20d=E2=80=99=C3=A9t=C3=A9))?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 12/23.txt | 6 +----- 12/25.txt | 6 +----- 12/27.txt | 6 +----- 12/30.txt | 6 +----- 12/32.txt | 6 +----- 12/34.txt | 6 +----- 12/37.txt | 6 +----- manifest.json | 8 ++++++++ 8 files changed, 15 insertions(+), 35 deletions(-) diff --git a/12/23.txt b/12/23.txt index 29f771c..7d50c79 100644 --- a/12/23.txt +++ b/12/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 yesus ɖo yi ŋu be : " ne nyi be yi me ponu nyuiɛ de , gblɔɛ nu, ni yi ɖoe ŋu nyuiɛde, mié jɔ yi ele po ŋu o . \v 24 Ana blɛ kɛɛ yi ni kayafa nunɔlagā -======= -\v 23 Yesu do yiŋu nɔ wo gblɔ be: gapopo la do vɔ be woaku Amegbetɔvi la ŋu. \v 24 Vava, vava mélé gbl ni mi be, ni bafoku mege ɖe anyi gba me, yi woku ola, ekema yiya ɖika cia anyi; ke ni eku la, elé cé ku sugbɔ. ->>>>>>> 6567292c723386c42c8c90eb311a9e65ea5f032e +\v 23 Yesu do yiŋu nɔ wo gblɔ be: gapopo la do vɔ be woaku Amegbetɔvi la ŋu. \v 24 Vava, vava mélé gbl ni mi be, ni bafoku mege ɖe anyi gba me, yi woku ola, ekema yiya ɖika cia anyi; ke ni eku la, elé cé ku sugbɔ. \ No newline at end of file diff --git a/12/25.txt b/12/25.txt index 5b6bfbe..aa1d23c 100644 --- a/12/25.txt +++ b/12/25.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 25 petro natre ɖe ga ŋu le xɔ zozo . wo le biɛ : " ewo ɖe eme nyi iki nusrɔlawo dometɔ ɖika ? " emɔ gblɔ be : " gbeɖe " \v 26 nunɔlaga ki kluviawo ɖometɔ ɖika nyi ameke petro kpa to na ki pome tɔ dika gblɔ be : " yi me kpɔ o le abɔame kiki a ? " -======= -\v 25 Ameke ke lɔa yiki agbe la abui; yi ameke léŋlɔ yiki agbe le xixié kea me la, aɖa ɖo ina agbemavɔ. \v 26 Niame ɖe di be, yeasubɔm la, neje yonyeme; yi giɛke nye la mele la gaŋu ŋfe subɔlaca laniɛ ne amea ɖ subɔam la yiya fofo la labu. ->>>>>>> 6567292c723386c42c8c90eb311a9e65ea5f032e +\v 25 Ameke ke lɔa yiki agbe la abui; yi ameke léŋlɔ yiki agbe le xixié kea me la, aɖa ɖo ina agbemavɔ. \v 26 Niame ɖe di be, yeasubɔm la, neje yonyeme; yi giɛke nye la mele la gaŋu ŋfe subɔlaca laniɛ ne amea ɖ subɔam la yiya fofo la labu. \ No newline at end of file diff --git a/12/27.txt b/12/27.txt index 3962055..6c054bd 100644 --- a/12/27.txt +++ b/12/27.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 27 Petro gbɔ mɔnu tete koklo ku atɔ . \v 28 Fifia wo kplɔ Yesus co kayafa gbɔ yi vɔnudrɔƒe . enyi ŋudie fɔfɔ me . wo ŋutɔ wo me yi vɔnuƒe a o , ɖe eɖi popota , ni paska za ɖuɖu ta . \v 29 pilato dova bia wo be : fɔ bubu kala me cɔ ɖe amekea ŋu o? " -======= -\v 27 Fifi tete ŋfe luvɔ vu vu kpekpekpe, yi leke magblɔ? Fofo dem co gapopo keame! gakie ekeata meva gapopo kea me ɖo. \v 28 Fofo, kɔ efe ŋkɔ ŋu. Tete gbe ɖi co jipo gblɔ be: Mekɔ iŋu xoxo, yi magbɔ iŋu \v 29 Azɔ amesugbɔ kewo lenatre, yi wose la, gblɔ be: jie ɖe gbe bubuwo gblɔ be: Mawudɔla ɖe po nukiki. ->>>>>>> 6567292c723386c42c8c90eb311a9e65ea5f032e +\v 27 Fifi tete ŋfe luvɔ vu vu kpekpekpe, yi leke magblɔ? Fofo dem co gapopo keame! gakie ekeata meva gapopo kea me ɖo. \v 28 Fofo, kɔ efe ŋkɔ ŋu. Tete gbe ɖi co jipo gblɔ be: Mekɔ iŋu xoxo, yi magbɔ iŋu \v 29 Azɔ amesugbɔ kewo lenatre, yi wose la, gblɔ be: jie ɖe gbe bubuwo gblɔ be: Mawudɔla ɖe po nukiki. \ No newline at end of file diff --git a/12/30.txt b/12/30.txt index e0dc8c2..12f98d1 100644 --- a/12/30.txt +++ b/12/30.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 30 wo ɖoe ŋu nɛ be : " ne nyi be ameke a nenye nuvɔwɔ la o la , me ma kplɔɛ va nɔ o ." \v 31 Pilato ɖoe ŋu nɔwo be : " micɔɛ yi mia ɖo kojo nɛ le mia ki ese nu : yudatɔwo gblɔ nɛ be : miaki ese me ɖemɔ ni mi be mi coku fia ni ame de o " -======= -\v 30 Yesu ɖo yiŋu be: menyi tanye gbe kea ɖi ɖo o, ke boŋ mia ta yi. \v 31 Fifi xixié kea me ki vɔnudɔdrɔ la ɖo; fifi ko woacɔ xixié kea mefia la daŋgbe. ->>>>>>> 6567292c723386c42c8c90eb311a9e65ea5f032e +\v 30 Yesu ɖo yiŋu be: menyi tanye gbe kea ɖi ɖo o, ke boŋ mia ta yi. \v 31 Fifi xixié kea me ki vɔnudɔdrɔ la ɖo; fifi ko woacɔ xixié kea mefia la daŋgbe. \ No newline at end of file diff --git a/12/32.txt b/12/32.txt index cb9d87b..fd1bfbb 100644 --- a/12/32.txt +++ b/12/32.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 32 ele gblɔ be wo ne yu nya ke , Yesus gblɔ fia eku pomevi ke yi ŋutɔ la ku la . \v 33 tete Pilato gbɔ trɔ va vɔnudrɔƒe , yɔ Yesus biɛ be : " ewo nyi yudatɔwoki fia ? " -======= -\v 32 Yi enye la ni woakeke ŋu ɖe ji co anyigba ji la mahe amekpata va nye ŋutɔ gbɔnye. \v 33 Ke egblɔ ekea co fia eku, ke lɔme a ku la. ->>>>>>> 6567292c723386c42c8c90eb311a9e65ea5f032e +\v 32 Yi enye la ni woakeke ŋu ɖe ji co anyigba ji la mahe amekpata va nye ŋutɔ gbɔnye. \v 33 Ke egblɔ ekea co fia eku, ke lɔme a ku la. \ No newline at end of file diff --git a/12/34.txt b/12/34.txt index 94f939b..47c37ab 100644 --- a/12/34.txt +++ b/12/34.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 34 Yesus ɖoe yi ŋu nɛ be : ele biaŋu le ewo ŋutɔ ɖo kui o me , alo wawoe tenɔ be na bia ŋu nene ? " \v 35 Pilato ɖoe ŋu be " yi nyi Yudatɔ a ? " wo ŋutɔ eƒe dukɔ kiki nunɔla gawoe lɔwo va ɖe asi nu . mie ewɔ ? " \v 36 Yesus ɖoe yi ŋu nɛ be nye fiaduƒe meco xixe teme o . ni enyi nene la eƒe nusrɔlawo la wɔ ava ni yudatɔwo nyawo eƒe fiaduƒe meco xixekeme -======= -\v 34 Tete amesugbɔ la xɔ eji nɛ be Miawo la misé le se la me be, Kristo ana nyi vaseɖe mavɔmavɔ me yi ewola leke ele gblɔ be, woacɔ yi nyi Amegbetɔvi kea. \v 35 Tete Yesu gblɔ nɔwo be: kekeli la agbɔ niɛ mia dome xeyiyi viaɖe ko. Mizɔ azɔli, yi kekeli la le mia gbɔ be viviti la ŋgbɔtu mio; yi ameke le zɔ dzɔlile viviti me la menye giɛke eyina o. \v 36 Eke kekeli la le miagbɔ la, mixɔ kekeli la ji se, be mizi kekele kiviwo. Enukeawo Yesu gblɔ, yi woco ŋu yi vayl iɖokui ɖewo. ->>>>>>> 6567292c723386c42c8c90eb311a9e65ea5f032e +\v 34 Tete amesugbɔ la xɔ eji nɛ be Miawo la misé le se la me be, Kristo ana nyi vaseɖe mavɔmavɔ me yi ewola leke ele gblɔ be, woacɔ yi nyi Amegbetɔvi kea. \v 35 Tete Yesu gblɔ nɔwo be: kekeli la agbɔ niɛ mia dome xeyiyi viaɖe ko. Mizɔ azɔli, yi kekeli la le mia gbɔ be viviti la ŋgbɔtu mio; yi ameke le zɔ dzɔlile viviti me la menye giɛke eyina o. \v 36 Eke kekeli la le miagbɔ la, mixɔ kekeli la ji se, be mizi kekele kiviwo. Enukeawo Yesu gblɔ, yi woco ŋu yi vayl iɖokui ɖewo. \ No newline at end of file diff --git a/12/37.txt b/12/37.txt index 08cd6e4..1741680 100644 --- a/12/37.txt +++ b/12/37.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 37 Pilato gbɔ biɛ be : " fia yi enyi a " eɖoe ŋu nɛ be : " ewo le gblɔɛ be me nyi fia . yi ta wo ji me . yi ta me va xexe keme be mato anukɔ di amekewo nyi anukɔditɔ wo la le ɖoto eƒe egbe . " \v 38 Pilato gblɔ nɛ be : " mié na yi nyi anukɔdi o ? " Eke gblɔ eŋu wɔ la , eɖova gblɔ ni Yudatɔwo be : " nye me kpɔ nu bada ke amekewɔ o . -======= -\v 37 Ke eke wo wɔ jesi geɖe keawo le woki ŋku me ca la, wo mexɔ eji se o, \v 38 le woawu nyi ke nyagblɔɖila Yesaya gblɔ di la nu be: Afetɔ, amekala yi xɔ miaki nyagblɔɖila la jise maha? ->>>>>>> 6567292c723386c42c8c90eb311a9e65ea5f032e +\v 37 Ke eke wo wɔ jesi geɖe keawo le woki ŋku me ca la, wo mexɔ eji se o, \v 38 le woawu nyi ke nyagblɔɖila Yesaya gblɔ di la nu be: Afetɔ, amekala yi xɔ miaki nyagblɔɖila la jise maha? \ No newline at end of file diff --git a/manifest.json b/manifest.json index ea98cde..1885373 100644 --- a/manifest.json +++ b/manifest.json @@ -157,6 +157,14 @@ "12-14", "12-16", "12-17", + "12-20", + "12-23", + "12-25", + "12-27", + "12-30", + "12-32", + "12-34", + "12-37", "12-41", "12-44", "12-46",