Sat Aug 06 2016 07:03:53 GMT+0100 (W. Central Africa Standard Time)

06/57.txt

@@ -1,6 +1 @@
-\v 57 Sigbe letsi etɔ agbeagbeɛ dɔŋ ɖoɖa, yi sigbe letsi ŋle agbe ɖo ŋtia, nɛnɛ ke amɛtsi ɖu ŋtilâ nyɛa la nɔ̂ agbe ɖo ŋti nyɛ. \v 58 Kpɔ̂nɔ̂ tsi ɖi
-<<<<<<< HEAD
- so djiŋkusiɛ ke, ŋɖe le sigbe tsi mia tɔ wo ɖu yi wo ku nɛnɛo. Amɛ tsi ɖu kpɔ̂nɔ̂ tsɛa la agbe tɛgbɛ. \v 59 Yesu to enyɔ̂ tsɛ wo le gbedoda xɔmɛ gatsimɛ yi le enufiaɔ le Kapernaum.
-=======
- so djiŋkusiɛ ke,  ŋɖe le sigbe tsi mia tɔ wo ɖu yi wo ku nɛnɛo. Amɛ tsi ɖu kpɔ̂nɔ̂ tsɛa la agbe tɛgbɛ. \v 59 Yesu to enyɔ̂ tsɛ wo le gbedoda xɔmɛ gatsimɛ yi le enufiaɔ le Kapernaum.
->>>>>>> 29030114d4ca22de2cda360e96bcf7fa0f6f0566
+\v 57 Sigbe letsi etɔ agbeagbeɛ dɔŋ ɖoɖa, yi sigbe letsi ŋle agbe ɖo ŋtia, nɛnɛ ke amɛtsi ɖu ŋtilâ nyɛa la nɔ̂ agbe ɖo ŋti nyɛ. \v 58 Kpɔ̂nɔ̂ tsi ɖi so djiŋkusiɛ ke, ŋɖe le sigbe tsi mia tɔ wo ɖu yi wo ku nɛnɛo. Amɛ tsi ɖu kpɔ̂nɔ̂ tsɛa la agbe tɛgbɛ. \v 59 Yesu to enyɔ̂ tsɛ wo le gbedoda xɔmɛ gatsimɛ yi le enufiaɔ le Kapernaum.

06/64.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 64 Gâkea, amɛ wo le mia domɛ tsi wo ŋɖe xɔseo wa. Ɖo so gɔ̂mɛ djedjea yesu djesi amɛ tsi wo ŋɖa xɔseo kudo amɛ tsi la sɛ. \v 65 E to be: yi ŋti ŋ nu nɔ̂ mi be amɛɖe ŋɖa va gbɔ̂nyɛ nɛ etɔ nyɛ ŋɖe ni mɔ̂ o.
-=======
-\v 65 Gâkea, amɛ wo le mia domɛ tsi wo ŋɖe xɔseo wa. Ɖo so gɔ̂mɛ djedjea yesu djesi amɛ tsi wo ŋɖa xɔseo kudo amɛ tsi la sɛ. \v 64 E to be: yi ŋti ŋ nu nɔ̂ mi be amɛɖe ŋɖa va gbɔ̂nyɛ nɛ etɔ nyɛ ŋɖe ni mɔ̂ o.
->>>>>>> 29030114d4ca22de2cda360e96bcf7fa0f6f0566
+\v 64 Gâkea, amɛ wo le mia domɛ tsi wo ŋɖe xɔseo wa. Ɖo so gɔ̂mɛ djedjea yesu djesi amɛ tsi wo ŋɖa xɔseo kudo amɛ tsi la sɛ. \v 65 E to be: yi ŋti ŋ nu nɔ̂ mi be amɛɖe ŋɖa va gbɔ̂nyɛ nɛ etɔ nyɛ ŋɖe ni mɔ̂ o.

06/66.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 66 Egodoa, nukplvi sugbɔ trɔ djo, yi wo ŋɖe gbe le kui o. \v 67 Yesu to nɛ wuive kpɔtɔɛ wo be: Alo miɔ̂ wo tsâ mi dji la tete yi ɖa? \v 68 Simon Pierre ɖo ŋti ni be, axuetɔ mɛɖe gbɔ mi la djo yi? Agbe mavɔ o nyɔ̂ wo le asi wo mɛ. \v 69 Mí xɔse yi mi dui djesi be woɖekɛ kpo yi nyi mawu kɔkɔɛ.
-=======
-\v 66 Egodoa, nukplvi sugbɔ trɔ djo, yi wo ŋɖe gbe le kui o.\v 67 Yesu to nɛ wuive kpɔtɔɛ wo be: Alo miɔ̂ wo tsâ mi dji la tete yi ɖa?\v 68  Simon Pierre ɖo ŋti ni be, axuetɔ mɛɖe gbɔ mi la djo yi? Agbe mavɔ o nyɔ̂ wo le asi wo mɛ. \v 69 Mí xɔse yi mi dui djesi be woɖekɛ kpo yi nyi mawu kɔkɔɛ.
->>>>>>> 29030114d4ca22de2cda360e96bcf7fa0f6f0566
+\v 66 Egodoa, nukplvi sugbɔ trɔ djo, yi wo ŋɖe gbe le kui o. \v 67 Yesu to nɛ wuive kpɔtɔɛ wo be: Alo miɔ̂ wo tsâ mi dji la tete yi ɖa? \v 68 Simon Pierre ɖo ŋti ni be, axuetɔ mɛɖe gbɔ mi la djo yi? Agbe mavɔ o nyɔ̂ wo le asi wo mɛ. \v 69 Mí xɔse yi mi dui djesi be woɖekɛ kpo yi nyi mawu kɔkɔɛ.

06/70.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 70 Yesu to nɔ̂ wo be alo ŋɖe enyɛ yi tsâ mi mɛ wuiveɛ wo yi amɛ ɖeka le miadomɛ nyi gbɔ̂gbɔ̂ o wa? \v 71 Ele enyɔ̂ tsɛ wo nuwɔ sɔ kuɖo yuda,simɔ̂ Iscarit o viɛ ŋti, ɖo yi yɔ, wuive o domɛtɔ ɖeka tsi lasa yeua.
-=======
-\v 71 Yesu to nɔ̂ wo be alo ŋɖe enyɛ yi tsâ mi mɛ wuiveɛ wo yi amɛ ɖeka le miadomɛ nyi gbɔ̂gbɔ̂  o wa? \v 70 Ele enyɔ̂ tsɛ wo nuwɔ sɔ kuɖo yuda,simɔ̂ Iscarit o viɛ ŋti, ɖo yi yɔ, wuive o domɛtɔ ɖeka tsi lasa yeua.
->>>>>>> 29030114d4ca22de2cda360e96bcf7fa0f6f0566
+\v 70 Yesu to nɔ̂ wo be alo ŋɖe enyɛ yi tsâ mi mɛ wuiveɛ wo yi amɛ ɖeka le miadomɛ nyi gbɔ̂gbɔ̂ o wa? \v 71 Ele enyɔ̂ tsɛ wo nuwɔ sɔ kuɖo yuda,simɔ̂ Iscarit o viɛ ŋti, ɖo yi yɔ, wuive o domɛtɔ ɖeka tsi lasa yeua.

07/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 7 \v 1 Le exɔ̂ wo godo lɔ, yesu to galilea, ɖo ŋɖe dji be ya yi jude o, ɖo djufu wo dji be ye wa wui. \v 2 Tsi exue zâ djufu wɔ tɔ ku tsɔtsi xɔ tɔ gogo lɔ
-=======
-\v 2 Le exɔ̂ wo godo lɔ, yesu to galilea, ɖo ŋɖe dji be ya yi jude o, ɖo djufu wo dji be ye wa wui.\v 1  Tsi exue zâ djufu wɔ tɔ ku tsɔtsi xɔ tɔ gogo lɔ
->>>>>>> 29030114d4ca22de2cda360e96bcf7fa0f6f0566
+\c 7 \c 7 \v 1 Le exɔ̂ wo godo lɔ, yesu to galilea, ɖo ŋɖe dji be ya yi jude o, ɖo djufu wo dji be ye wa wui. \v 2 Tsi exue zâ djufu wɔ tɔ ku tsɔtsi xɔ tɔ gogo lɔ

07/03.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 3 Yesu nɔviɛ wo nu ni be: djo le fiɛ ayi judé nɛ nuklavi tɔwo o wa kpɔ edɔ tsi wo o wa. \v 4 Amɛɖe ŋɖe wannɔ̂ énu le wlawla mɛ, nɛ edji be amɛ wo nɛ djesi ye. To enu wawa wo mɛa, wo ŋtɔ ɖe ɖokuio fia xixea.
-=======
-\v 3 Yesu nɔviɛ wo nu ni be: djo le fiɛ ayi judé nɛ nuklavi tɔwo o wa kpɔ edɔ tsi wo o wa.\v 4  Amɛɖe ŋɖe wannɔ̂ énu le wlawla mɛ, nɛ edji be amɛ wo nɛ djesi ye. To enu wawa wo mɛa, wo ŋtɔ ɖe ɖokuio fia xixea.
->>>>>>> 29030114d4ca22de2cda360e96bcf7fa0f6f0566
+\v 3 Yesu nɔviɛ wo nu ni be: djo le fiɛ ayi judé nɛ nuklavi tɔwo o wa kpɔ edɔ tsi wo o wa. \v 4 Amɛɖe ŋɖe wannɔ̂ énu le wlawla mɛ, nɛ edji be amɛ wo nɛ djesi ye. To enu wawa wo mɛa, wo ŋtɔ ɖe ɖokuio fia xixea.

07/05.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 5 Nɔ̂viɛ wo ŋtɔ tsâ ŋɖe kâɖodji o. \v 6 Yi yesu to nɔ̂ wo be: gaxoxo tsi nyɛ ŋɖe kpɔ va o, vɔa miatɔ yɛ le xoxo vɔ. \v 7 Xixé ɛ ŋɖe leke mi o vɔa e leke ŋ xoxo ɖo ŋɖe kùnu be yi o dɔ wawa wo ŋɖe nyɔ̂ .
-=======
-\v 5 Nɔ̂viɛ wo ŋtɔ tsâ ŋɖe kâɖodji o. \v 6 Yi yesu to nɔ̂ wo be: gaxoxo tsi nyɛ ŋɖe kpɔ va o, vɔa miatɔ  yɛ le xoxo vɔ. \v 7 Xixé ɛ ŋɖe leke mi o vɔa e leke ŋ xoxo ɖo ŋɖe kùnu be yi o dɔ wawa wo ŋɖe nyɔ̂ .
->>>>>>> 29030114d4ca22de2cda360e96bcf7fa0f6f0566
+\v 5 Nɔ̂viɛ wo ŋtɔ tsâ ŋɖe kâɖodji o. \v 6 Yi yesu to nɔ̂ wo be: gaxoxo tsi nyɛ ŋɖe kpɔ va o, vɔa miatɔ yɛ le xoxo vɔ. \v 7 Xixé ɛ ŋɖe leke mi o vɔa e leke ŋ xoxo ɖo ŋɖe kùnu be yi o dɔ wawa wo ŋɖe nyɔ̂ .

manifest.json

@@ -148,8 +148,16 @@
 		"06-48",
 		"06-50",
 		"06-52",
+		"06-54",
+		"06-57",
 		"06-60",
 		"06-62",
+		"06-64",
+		"06-66",
+		"06-70",
+		"07-01",
+		"07-03",
+		"07-05",
 		"07-14",
 		"07-17",
 		"07-37",