Mon Aug 08 2022 16:37:06 GMT+0200 (heure d’été d’Europe centrale)

2022-08-08 16:37:07 +02:00 · 2022-08-08 16:37:07 +02:00 · fdbcc40c18
parent 24d20c0ea3
commit fdbcc40c18
5 changed files with 7 additions and 20 deletions
--- a/18/21.txt
+++ b/18/21.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 21 Tete Pétro va Yésus gbɔ̀ yi égblobe afetɔ̀ Silèlèji macɔ̀ novinyé ki nùvɔ̀wo có ké o, kéwówɔ̀ ɖe hunyé, kaka zi àɖré? \v 22 Yèsus gblónɛbe? << nyé gblonimibe ziàɖréwa vóia kàkà ziàɖré tèpé blàaɖre.
-=======
-\v 21 Tete Pétro va Yésus gbɔ̀ yi égblobe afetɔ̀ Silèlèji macɔ̀ novinyé ki nùvɔ̀wo có ké o, kéwówɔ̀ ɖe hunyé, kaka zi àɖré?  \v 22 Yèsus gblónɛbe? << nyé gblonimibe ziàɖréwa vóia kàkà ziàɖré tèpé blàaɖre.
->>>>>>> d81670ad52aef7d05ee468c4a850c0375c4289ba
+\v 21 Pɔlu   vá i  nùn  nǝ̀  yesu   bǝ Aɔcòtɔ̀   zǝ̀  nǝ̀nǝ̀   i  maàn    sǝ̀ kǝ̀   tiin  nɔ̀nvi   nǝ̀  i wɔ̀   ǝ̀nù̀vɔɛ̀n ɖɛ  ǝ̀ŋùnyɛ̀̀  ?  kǝ̀kǝ̀   zǝadrǝa? >> \v 22 Yesiu  nùn   nɛ̀n  bǝ  <<ŋɛ̀n ŋ   nùn   nǝ̀   nù   bǝ  zadrǝ   o  ganŋkǝ  kǝkǝ  zǝ̀   kàkitàkpòcùwòciadrǝ .
--- a/19/03.txt
+++ b/19/03.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 3 Pharisitɔwo yigbɔ le tekpɔ le biɛbe:< le le ésé nu be ŋucu nagbe nyɔnu le enyamadi nya ma?>> \v 4 Yesu doyi ŋu nɔwo be:< xléle enuŋlɔŋlɔ kele kele me le egɔme jejea me, wo wɔ nyɔnu kiki ŋucu?
-=======
-\v 3 Yi Farisitɔwo va yi ́gbɔbe:wo ɖe mɔ ni ame ŋacu be na dasi le srɔnyunuɔu ɖe enya madi nyawo bua? \v 4 Yesu ɖoyi ŋu gblɔbe: mi me xle kpo lɔe ameke wɔ ame kekele la, ŋucu kiki nyunu yi ewɔ o a?
->>>>>>> d81670ad52aef7d05ee468c4a850c0375c4289ba
+\v 3 Faristɔ̀wó tə̀bɔ̀ɛ̀, ì ɖoə́ kpɔ́ í nún bə: "Ǝsə́a ɖə́mɔ́n nə́ ŋúcú bə nàngbə ásià cágbə ənúɖə tɔ̀ á?" \v 4 Yesu ɖó ŋún ì nùn bə: "Mì ŋhrɛ̀n kpɔ̀ bə àmə̀ kə́ wɔ̀ có gɔ̀mə̀jə́jə́ wɔ̀ wó àcú kiɖə ásià?
--- a/19/05.txt
+++ b/19/05.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 5 Yi wo gbɔ gbɔ be:"enu ŋuta, ŋucu aco ŋu le étua kiki enu ekude srɔ ŋu, yi wo ame eve wɔatrɔ zi ŋutila dika a?" \v 6 Le gaŋua wo megbɔ nyi ame eve, vua ŋutila dika. Le yita enuke Mawu bla, amede ŋugbɔ mɛ yime o.>>
-=======
-\v 5 Yi egbɔ le gblɔ be ŋucu a dasi etua kiki enua ɖe yi aku ɖe srɔa nyunyuŋu yi woazi eŋutila ɖika. \v 6 ɖe iyata la womegbɔ evea o ne egbe la eŋutila ɖika yi yi enuke Mawu bla la ameɖekpekpe ma teŋu mɛ o.
->>>>>>> d81670ad52aef7d05ee468c4a850c0375c4289ba
+\v 5 Í ì gbə nún bə: "cágbə hinàn tɔ̀á, ŋúcú là có gbə yə́ dadá kiɖə yə́ nánán ɖɛ̀ ì là kùdə́ ásià ŋù, ì wó àmə̀vəáwó wóa trɔ́ zùn ŋtirán ɖə́ka á? \v 6 Wó ŋ gbə nyin àmə̀və̀ o, vɔ́a ŋtirán ɖə́kà. Cagbə́ hinàntɔ̀ á, ənùkə Mawu cɔ́ də́ ədúa, àmə̀ɖə́ ŋkáa mɛ̀ɛn o."
--- a/19/07.txt
+++ b/19/07.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 7 Wole biɛ be:< yi Mose na mi gbégbe ki homa keŋ kafi na nyɛo ?>> \v 8 Edoyi ŋu nɔ wo be:<< Miaki éyime titri ta yi, Mose demɔ nami mɔ be miagbe mia srɔwo vua gɔme jejeme, mele nene o.>> \v 9 Mele toni mi:<< Ameke la gbe srɔ ni me nyi be ewɔ ahasi o yi ede ebu la ewɔ ahasi yi nenekié Ameke de nyɔnu gbegbe la wɔ ahasi.>>
-=======
-\v 7 Ele gblɔ nɔwo be: Mie jɔta yi Mose do sewo ana gbegbehoma, yi woaɖe asi le iŋu ma? \v 8 Ele gblɔ nɔbe le miaki jimesese ŋu yi Mose demɔni mibe miadasi le mia srɔ wo ŋu. Gakie mele nene le gɔmejeje la me o. \v 9 Yi mele gblɔ ni be ameke ɖasi ie srɔ ŋu yi ni menyi ahasiwɔwɔ ŋu yi woaɖe ebu la ame a ya wɔahasi.
->>>>>>> d81670ad52aef7d05ee468c4a850c0375c4289ba
+\v 7 \v 8 \v 9 Conflict Parsing Error
--- a/manifest.json
+++ b/manifest.json
@ -285,6 +285,7 @@
 		"18-15",
 		"18-17",
 		"18-18",
+		"18-21",
 		"18-23",
 		"18-26",
 		"18-28",
@ -293,6 +294,8 @@
 		"18-34",
 		"19-title",
 		"19-01",
+		"19-03",
+		"19-05",
 		"19-28",
 		"19-29",
 		"20-title",