From 4025ad58e2e9a8fa6e4db199aa17b27080ed7d9e Mon Sep 17 00:00:00 2001 From: parfait-ayanou Date: Thu, 4 Aug 2016 15:10:58 +0100 Subject: [PATCH] Thu Aug 04 2016 15:10:57 GMT+0100 (W. Central Africa Standard Time) --- 08/01.txt | 6 +----- 08/05.txt | 6 +----- 08/24.txt | 6 +----- 09/01.txt | 6 +----- manifest.json | 2 +- 5 files changed, 5 insertions(+), 21 deletions(-) diff --git a/08/01.txt b/08/01.txt index 206e9e6..a46a71a 100755 --- a/08/01.txt +++ b/08/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -XxxxXxxxxxXxɛɛɛɛɛɛɛxxxxxxxxxxxxɛx -======= -\v 1 Le ŋkeke xɔn wo mea,ameha gbogbo ɖewo va,nuɖe ŋdeli wola ɖuo.Yesu yɔ nukplanviwo tonɔ wo be: \v 2 Axun dɔmɛ trɔ ɖɔ ameha ŋtí;ɖo ŋkeke tɔn ke wo lé gbɔn nyé ,vɔ o ŋdé ɖu ŋɖekpikpi ó. \v 3 Né ó djó enu maɖu maɖua,ŋsɛn la vɔ dowó le mɔdji,ɖo amesugbɔ so djidji xoe le wó domé. \v 4 Nukplanviwó ɖo ŋtí ní bé:fiɖé mila kpɔ ŋdudu lé le zogbé yɛ dji nɔn wó? ->>>>>>> dc7df2e027e280ecf9d3f706dd5482242b9c33d6 +\c 8 \v 1 Le ŋkeke xɔn wo mea,ameha gbogbo ɖewo va,nuɖe ŋdeli wola ɖuo.Yesu yɔ nukplanviwo tonɔ wo be: \v 2 Axun dɔmɛ trɔ ɖɔ ameha ŋtí;ɖo ŋkeke tɔn ke wo lé gbɔn nyé ,vɔ o ŋdé ɖu ŋɖekpikpi ó. \v 3 Né ó djó enu maɖu maɖua,ŋsɛn la vɔ dowó le mɔdji,ɖo amesugbɔ so djidji xoe le wó domé. \v 4 Nukplanviwó ɖo ŋtí ní bé:fiɖé mila kpɔ ŋdudu lé le zogbé yɛ dji nɔn wó? \ No newline at end of file diff --git a/08/05.txt b/08/05.txt index ff4a258..c528f3a 100755 --- a/08/05.txt +++ b/08/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Xxxxxxxxxxxxɛɛɛɛxxxxxxxxxx -======= -\v 5Ebiɔ wo bé,bolo nɛn ní yi le miashí?ó bé amadrɛ. Eto né ameha wó bé ó né nɔn anyí ɖó anyigban.\v 6 E sɔ bolo amadrɛ lɔ yí i do gbéɖa ɖó ta,esɔɛ na yó nukplanviwó yí wo mi na amehawó. ->>>>>>> dc7df2e027e280ecf9d3f706dd5482242b9c33d6 +\v 5 wo bé,bolo nɛn ní yi le miashí?ó bé amadrɛ. Eto né ameha wó bé ó né nɔn anyí ɖó anyigban. \v 6 E sɔ bolo amadrɛ lɔ yí i do gbéɖa ɖó ta,esɔɛ na yó nukplanviwó yí wo mi na amehawó. \ No newline at end of file diff --git a/08/24.txt b/08/24.txt index b4daba0..2fe764f 100755 --- a/08/24.txt +++ b/08/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 E kɔ ŋme yídi yí í be:Ŋ le amewo kpɔ ɔ vɔ wó ɖí ati tiwo le zɔnzɔn kɔ. \v 25 E gbe sɔ alɔ sɔ daɖó yo ŋkuvi dji,yi í na be ekpɔ nu,yi í kpɔ nu nyú ɖé. \v 26 Yesu dúí mɔ yí í to ni be:Ŋgbe yí edjuɔ meo -======= -xXxxxxxxxxxxxx ->>>>>>> 3b5526bdfbcd85488cc9902ab0fc5499482da397 +\v 24 E kɔ ŋme yídi yí í be:Ŋ le amewo kpɔ ɔ vɔ wó ɖí ati tiwo le zɔnzɔn kɔ. \v 25 E gbe sɔ alɔ sɔ daɖó yo ŋkuvi dji,yi í na be ekpɔ nu,yi í kpɔ nu nyú ɖé. \v 26 Yesu dúí mɔ yí í to ni be:Ŋgbe yí edjuɔ meo. \ No newline at end of file diff --git a/09/01.txt b/09/01.txt index 95ab7ce..27700f3 100755 --- a/09/01.txt +++ b/09/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Yesu nu nɔ wó be ,lé nyawó tótó mé ŋlé nunuwɔ nɔn mi bé mia domé tɔ ȡéwo ŋdá ku gbɔxoé akpɔ Mawu fiɔ ȡu xoé kudo yo ŋsɛn. \v 2 Lé ŋkeke amadɛn yo ŋgbo domea,Yesu kplɔ Piyɛ,Ejan kudo Jaki yí to kɔkɔ ȡéka dji.Yí yo nɔnnɔn mé trɔ lé wo ŋmé. \v 3 Yoó ŋmé klin,yí yo wu lé zo dawɔ.mé ȡé kpíkpí ŋda tɛn ŋun nya awu yí ya klin nin nin. -======= -Xxxxxxxxxxx ->>>>>>> 3b5526bdfbcd85488cc9902ab0fc5499482da397 +\c 9 \v 1 Yesu nu nɔ wó be ,lé nyawó tótó mé ŋlé nunuwɔ nɔn mi bé mia domé tɔ ȡéwo ŋdá ku gbɔxoé akpɔ Mawu fiɔ ȡu xoé kudo yo ŋsɛn. \v 2 Lé ŋkeke amadɛn yo ŋgbo domea,Yesu kplɔ Piyɛ,Ejan kudo Jaki yí to kɔkɔ ȡéka dji.Yí yo nɔnnɔn mé trɔ lé wo ŋmé. \v 3 Yoó ŋmé klin,yí yo wu lé zo dawɔ.mé ȡé kpíkpí ŋda tɛn ŋun nya awu yí ya klin nin nin. \ No newline at end of file diff --git a/manifest.json b/manifest.json index ad2894c..da19cbc 100755 --- a/manifest.json +++ b/manifest.json @@ -154,6 +154,7 @@ "07-31", "07-33", "07-36", + "08-01", "08-05", "08-07", "08-11", @@ -170,7 +171,6 @@ "08-35", "08-38", "09-01", - "09-04", "09-07", "09-09", "09-11",