From 1e99fd515b6d1348db683ec9183aa65a5ed763b9 Mon Sep 17 00:00:00 2001 From: Danjuma_Alfred_H Date: Tue, 4 Jul 2017 10:11:42 +0100 Subject: [PATCH] Tue Jul 04 2017 10:11:42 GMT+0100 (W. Central Africa Standard Time) --- 05/01.txt | 6 +----- 05/05.txt | 6 +----- 05/09.txt | 6 +----- 05/11.txt | 6 +----- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/05/01.txt b/05/01.txt index 6d1123d8..470d8b94 100644 --- a/05/01.txt +++ b/05/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Ayi Yesu zang ubin bangi, i hu atsu hun ding khiki utik, i epu kilug kyu le itsari belim etim engi ekin mi gir. \v 2 I hu undu engi afven ri zhee be ozu kyong. \v 3 Budin esi andu ami okhin kudin, Agya kidin Kikpe kukhyie esi ki nyi.\v 4 Budin esi ni abi ere ta kekin ubeh esi kapu ebi. -======= -\v 1 Ayi Yesu zang ubin bangi-n, i hun ding khiki kehen. Kekpeng akhi i kyu le itsari-n belim etim ngi aba fa mi. \v 2 Evung undu ngi i ze bi, kyong. \v 3 "Eding esi ni abe ele kekhim ni kuden, agya khiding kukye esi ibi. \v 4 Eding esi ni bangi abe re bri orup, khiki ere bi ba ohu bi ikhip. ->>>>>>> fb2aa095632fa4f429ac9b929bff2e2832d6a237 +\c 5 \v 1 Ayi Yesu zang ubin bangi-n, i hun ding khiki kehen. Kekpeng akhi i kyu le itsari-n belim etim ngi aba fa mi. \v 2 Evung undu ngi i ze bi, kyong. \v 3 "Eding esi ni abe ele kekhim ni kuden, agya khiding kukye esi ibi. \v 4 Eding esi ni bangi abe re bri orup, khiki ere bi ba ohu bi ikhip. \ No newline at end of file diff --git a/05/05.txt b/05/05.txt index 5fb0014d..997e8c97 100644 --- a/05/05.txt +++ b/05/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Budin esi ndi abe alu ibur kitsi esi kibe. \v 6 Budin esi ndi bangi abe bunyong kenung re ohu be, be aba fa kudir engi.\v 7 Budin esi ndi abe alu kimbog, yi egi kimbog esi kapu ebe. \v 8 Budin esi ndi abe alu orub otin be aba zang Ikpe. -======= -\v 5 Eding esi ni abe ni ibur khiki ere ba lyi kayang. \v 6 Eding esi ni abe ele bunyong eyi ongur ni kenung, ayi bafa kudri. \v 7 Eding esi ni abe alu yi kjimbok-n, ayi ba fa igi khimbok-n \v 8 Eding esi ni abe orup ibi atin-n, khiki ere ba zang Ikpe. ->>>>>>> fb2aa095632fa4f429ac9b929bff2e2832d6a237 +\v 5 Eding esi ni abe ni ibur khiki ere ba lyi kayang. \v 6 Eding esi ni abe ele bunyong eyi ongur ni kenung, ayi bafa kudri. \v 7 Eding esi ni abe alu yi kjimbok-n, ayi ba fa igi khimbok-n \v 8 Eding esi ni abe orup ibi atin-n, khiki ere ba zang Ikpe. \ No newline at end of file diff --git a/05/09.txt b/05/09.txt index 1b975a1e..a29b7e29 100644 --- a/05/09.txt +++ b/05/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Budin esi ndi abe eri ohu utah eke ndi be zi bi bodung lkpe. \v 10 Budin esi ndi abe be ri afa bi ti ozu kenung. Kapu ebi esi agya kiding kikpe kukhyie. -======= -\v 9 Eding esi ni abe apu bukun, khiki ere be zi bi belim Ikpe. \v 10 Eding esi ni bangi abe betsim bi khiki kenung, khiki ere agya khiding kukye esi ibi. ->>>>>>> fb2aa095632fa4f429ac9b929bff2e2832d6a237 +\v 9 Eding esi ni abe apu bukun, khiki ere be zi bi belim Ikpe. \v 10 Eding esi ni bangi abe betsim bi khiki kenung, khiki ere agya khiding kukye esi ibi. \ No newline at end of file diff --git a/05/11.txt b/05/11.txt index dac05ce6..f2b2d2c3 100644 --- a/05/11.txt +++ b/05/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Budin esi ondu ayi be ri ezik mu eyi uf, be ri emien mu abi itu keki keki, kazim mbe kiki enim. \v 12 Hu ashir diding, kiki ere kapu kiga ele mbe khkhyie. Esi utu awu ele leng be afa bangi Izur keyir re ning omu te si irim. -======= -\v 11 Eding esi inyi ayi bangi atu ke etsim nyi emeng abi iyu keki keki alu nyi khiki nim. \v 12 Deng, atin orup, kubu kamang inyi khikyo mbe ele kukye. Ni utu awu leng bangi etsim bangi izir abe ele kayang ning lang anyi. ->>>>>>> fb2aa095632fa4f429ac9b929bff2e2832d6a237 +\v 11 Eding esi inyi ayi bangi atu ke etsim nyi emeng abi iyu keki keki alu nyi khiki nim. \v 12 Deng, atin orup, kubu kamang inyi khikyo mbe ele kukye. Ni utu awu leng bangi etsim bangi izir abe ele kayang ning lang anyi. \ No newline at end of file