Tue Aug 01 2023 08:17:50 GMT+0200 (heure d’été d’Europe centrale)
This commit is contained in:
parent
0361fbe9eb
commit
3130997071
|
@ -1,5 +1 @@
|
|||
<<<<<<< HEAD
|
||||
\v 38 Dawé xé mɛ wɛ gbigbɔ nyanyla lɛ tɔn sin ɖé ɖɔ byɔ Jézu ɖɔ wé a xodwé Amɔ Jézu (lɛ kɔ nɛ bo ɖo ɖɔ nɛ ɖɔ. \v 39 Lɛkɔ yi xwé twé gbé na nuɖaxo xé lɛ Mawu wa na wé ɖé yi jla na amɛ lɛ>> Dawé lɔ lɛkɔ bo yi jla gbɔn toxo lɔ bi mɛ nu xé Jézu wa nɛ lɛ dé.
|
||||
=======
|
||||
\v 38 Dawé xé mɛ wɛ gbigbɔ nyanyla lɛ tɔn sin ɖé ɖɔ byɔ Jézu ɖɔ wé a xodwé Amɔ Jézu (lɛ kɔ nɛ bo ɖo ɖɔ nɛ ɖɔ. \v 39 Lɛkɔ yi xwé twé gbé na nuɖaxo xé lɛ Mawu wa na wé ɖé yi jla na amɛ lɛ>> Dawé lɔ lɛkɔ bo yi jla gbɔn toxo lɔ bi mɛ nu xé Jézu wa nɛ lɛ dé.
|
||||
>>>>>>> 8321142320758e4181c276a88e10b7c1f32273e9
|
||||
\v 38 \v 39 Conflict Parsing Error
|
|
@ -27,7 +27,7 @@
|
|||
"language_id": "fr",
|
||||
"resource_id": "ulb",
|
||||
"checking_level": "3",
|
||||
"date_modified": "2022-03-24T16:04:32.713068+00:00",
|
||||
"date_modified": "2023-02-22T16:07:21.6443472+00:00",
|
||||
"version": "7.1"
|
||||
}
|
||||
],
|
||||
|
@ -186,6 +186,7 @@
|
|||
"08-32",
|
||||
"08-34",
|
||||
"08-36",
|
||||
"08-38",
|
||||
"08-40",
|
||||
"08-43",
|
||||
"08-45",
|
||||
|
|
Loading…
Reference in New Issue