Wed Jul 01 2020 10:01:58 GMT-0400 (EDT)

01/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 1 \v 1 Cã , Mawu po nu ne mia tɔ tɔwo , edjiedji le nɔnɔme vovovo gbogboɖe me se to nyablɔɖilawo dji.   \v 2 Vɔ le gapopo kpɔtɔɛ yawó mea, e ponu ne mi tó via dji, ame yi be ɖoanyi domenyila ne nuwo kekeŋ , me yi dji be to.  \v 3 Wɔ xixea, me yi nyi Mawu be nuci kokoe be kekle gaku yibé Mawunyinyi be nɔnɔme, e le nuwo kekeŋ ɖasi se to yibe nusɛ be nya me, e klɔ miabe nuvɔwo ɖa ye be bɔbɔ nɔ anyi le bubume le tɔtɔa be nu ɖusi me le djipowo nutowóme.
-=======
-\v 1 Cã , Mawu po nu ne mia tɔ tɔwo , edjiedji le nɔnɔme vovovo gbogboɖe me se to nyablɔɖilawo dji. \v 2 Vɔ le gapopo kpɔtɔɛ yawó mea, e ponu ne mi tó via dji, ame yi be ɖoanyi domenyila ne nuwo kekeŋ , me yi dji be to. \v 3 Wɔ xixea, me yi nyi Mawu be nuci kokoe be kekle gaku yibé Mawunyinyi be nɔnɔme, e le nuwo kekeŋ ɖasi se to yibe nusɛ be nya me, e klɔ miabe nuvɔwo ɖa ye be bɔbɔ nɔ anyi le bubume le tɔtɔa be nu ɖusi me le djipowo nutowóme.
->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c
+\c 1 \v 1 Cã , Mawu po nu ne mia tɔ tɔwo , edjiedji le nɔnɔme vovovo gbogboɖe me se to nyablɔɖilawo dji. \v 2 Vɔ le gapopo kpɔtɔɛ yawó mea, e ponu ne mi tó via dji, ame yi be ɖoanyi domenyila ne nuwo kekeŋ , me yi dji be to. \v 3 Wɔ xixea, me yi nyi Mawu be nuci kokoe be kekle gaku yibé Mawunyinyi be nɔnɔme, e le nuwo kekeŋ ɖasi se to yibe nusɛ be nya me, e klɔ miabe nuvɔwo ɖa ye be bɔbɔ nɔ anyi le bubume le tɔtɔa be nu ɖusi me le djipowo nutowóme.

01/06.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 6 Ye eyi be gakplɔ viɖiagbɔa v xi xea  me, e gblɔ be : Mawu be dɔlawo kebeŋ no subɔɛ !  \v 7 Wu nenema, e gbɔ co Mawudɔlawo ŋti be : e wo yibe dɔlawo aya ƒoƒo, ku ewo yibe dɔ cɔlawo edjo baɖe.
-=======
-\v 6 Ye eyi be gakplɔ viɖiagbɔa v xi xea  me, e gblɔ be : Mawu be dɔlawo kebeŋ no subɔɛ ! \v 7 Wu nenema, e gbɔ co Mawudɔlawo ŋti be : e wo yibe dɔlawo aya ƒoƒo, ku ewo yibe dɔ cɔlawo edjo baɖe.
->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c
+\v 6 Ye eyi be gakplɔ viɖiagbɔa v xi xea  me, e gblɔ be : Mawu be dɔlawo kebeŋ no subɔɛ ! \v 7 Wu nenema, e gbɔ co Mawudɔlawo ŋti be : e wo yibe dɔlawo aya ƒoƒo, ku ewo yibe dɔ cɔlawo edjo baɖe.

01/08.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 8 Vɔa e gblɔ ne via yabe : ƒiɔ ʒikpui wɔa õ Mawu, e li yi mavɔmavɔ; ƒiɔ ɖuɖu be acikplɔwɔa nyĩ yăteƒe be ƒiɔcikplɔ;  \v 9 Le lɔ djɔdjɔɛ nye nye, vɔ le cri nu madjɔ madjɔ wɔwɔ; numa ŋti, õ Mawu, Mawu wo si  djidjɔ bami no gbo hawociwo ta.
-=======
-\v 8 Vɔa e gblɔ ne via yabe : ƒiɔ ʒikpui wɔa õ Mawu, e li yi mavɔmavɔ; ƒiɔ ɖuɖu be acikplɔwɔa nyĩ yăteƒe be ƒiɔcikplɔ; \v 9 Le lɔ djɔdjɔɛ nye nye, vɔ le cri nu madjɔ madjɔ wɔwɔ; numa ŋti, õ Mawu, Mawu wo si  djidjɔ bami no gbo hawociwo ta.
->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c
+\v 8 Vɔa e gblɔ ne via yabe : ƒiɔ ʒikpui wɔa õ Mawu, e li yi mavɔmavɔ; ƒiɔ ɖuɖu be acikplɔwɔa nyĩ yăteƒe be ƒiɔcikplɔ; \v 9 Le lɔ djɔdjɔɛ nye nye, vɔ le cri nu madjɔ madjɔ wɔwɔ; numa ŋti, õ Mawu, Mawu wo si  djidjɔ bami no gbo hawociwo ta.

01/10.txt

@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 10 Gaku be : ewo, Aƒetɔ, le wɔ anyigbã co gɔmedjedjea me, ye asinu dɔ wɔwɔ wo woe nyi djipowo;
-\v 11 Oódja crɔ, vɔ wɔɛa lanɛɖa. Oódja doxo sogbe nu dodo ene, \v 12 Le djava ŋlɔwo sigbe awu ye la ɖɔliwo, vɔ oŋtɔ ya la kpɔtɔ anɔ nenea. Ye eƒewówo ma vɔ gbeɖe gbeɖeo.
-=======
-\v 10 Gaku be : ewo, Aƒetɔ, le wɔ anyigbã co gɔmedjedjea me, ye asinu dɔ wɔwɔ wo woe nyi djipowo; \v 11 Oódja crɔ, vɔ wɔɛa lanɛɖa. Oódja doxo sogbe nu dodo ene, \v 12 Le djava ŋlɔwo sigbe awu ye la ɖɔliwo, vɔ oŋtɔ ya la kpɔtɔ anɔ nenea. Ye eƒewówo ma vɔ gbeɖe gbeɖeo.
->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c
+\v 10 Gaku be : ewo, Aƒetɔ, le wɔ anyigbã co gɔmedjedjea me, ye asinu dɔ wɔwɔ wo woe nyi djipowo; \v 11 Oódja crɔ, vɔ wɔɛa lanɛɖa. Oódja doxo sogbe nu dodo ene, \v 12 Le djava ŋlɔwo sigbe awu ye la ɖɔliwo, vɔ oŋtɔ ya la kpɔtɔ anɔ nenea. Ye eƒewówo ma vɔ gbeɖe gbeɖeo.

02/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 2 \v 1 Yĩtia, Miɔ mi ɖola leɖe nu yio mi sewoa ŋti nywiɖe alebe mima dɔ ayi adjoge le oũti o
-=======
-\v 1 Yĩtia, Miɔ mi ɖola leɖe nu yio mi sewoa ŋti nywiɖe alebe mima dɔ ayi adjoge le oũti o
->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c
+\c 2 \v 1 Yĩtia, Miɔ mi ɖola leɖe nu yio mi sewoa ŋti nywiɖe alebe mima dɔ ayi adjoge le oũti o

02/02.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 2 ɖoa ne  nya yiwo ogblɔ to Mawu dɔlawo djia, kpɔ yibe nusẽ, sedji mawɔmawɔwo ku to maɖomaɖwo kekeŋ kpɔ wobe teƒe ɖoɖa,  \v 3 lekelawɔ mia si ne mi ɖasi ɖeɖe kpɔkpɔ gă ya ɖi, ke gbã Apetɔa ŋtɔ ɖe gbeƒă, me yio sea odokpedjivne mi,  \v 4 Mawu cɔ, djesi , gaku nukunu vovovowo le kpeɖoũ woabe ɖaseɖiɖiwo dji, ku to gbɔgbɔ kɔkɔɛ be nu nana yiwo oma ne wo le Mawu ŋtɔ be lɔlɔnu nua dji.
-=======
-\v 2 ɖoa ne  nya yiwo ogblɔ to Mawu dɔlawo djia, kpɔ yibe nusẽ, sedji mawɔmawɔwo ku to maɖomaɖwo kekeŋ kpɔ wobe teƒe ɖoɖa, \v 3 lekelawɔ mia si ne mi ɖasi ɖeɖe kpɔkpɔ gă ya ɖi, ke gbã Apetɔa ŋtɔ ɖe gbeƒă, me yio sea odokpedjivne mi, \v 4 Mawu cɔ, djesi , gaku nukunu vovovowo le kpeɖoũ woabe ɖaseɖiɖiwo dji, ku to gbɔgbɔ kɔkɔɛ be nu nana yiwo oma ne wo le Mawu ŋtɔ be lɔlɔnu nua dji.
->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c
+\v 2 ɖoa ne  nya yiwo ogblɔ to Mawu dɔlawo djia, kpɔ yibe nusẽ, sedji mawɔmawɔwo ku to maɖomaɖwo kekeŋ kpɔ wobe teƒe ɖoɖa, \v 3 lekelawɔ mia si ne mi ɖasi ɖeɖe kpɔkpɔ gă ya ɖi, ke gbã Apetɔa ŋtɔ ɖe gbeƒă, me yio sea odokpedjivne mi, \v 4 Mawu cɔ, djesi , gaku nukunu vovovowo le kpeɖoũ woabe ɖaseɖiɖiwo dji, ku to gbɔgbɔ kɔkɔɛ be nu nana yiwo oma ne wo le Mawu ŋtɔ be lɔlɔnu nua dji.

02/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-ETA  2
-=======
-ETA 2
->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c
+ETA 2

front/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-HEBRIT)WO  BE WOMA
-=======
-Hebrews
->>>>>>> b64b9d5cd0256abd1a12236d6568517013f4ee2c
+HEBRIT)WO  BE WOMA

manifest.json

@@ -34,7 +34,8 @@
 	"parent_draft": {},
 	"translators": [
 		"popo",
-		"ben33"
+		"ben33",
+		"parfait-ayanou"
 	],
 	"finished_chunks": [
 		"01-title",