diff --git a/03/01.txt b/03/01.txt index 05e2a6e..272e3bd 100644 --- a/03/01.txt +++ b/03/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Ka nyongo ndo banadji bakpa nde banda na nkiki belekeani bia Yeso ntekisi ba Mokonga na Mokota phumi na mbo belekei.\v 2 Dha mbeeki ndea mbe dambisi,bia bondo Mosa dha kendu ndiake bubui.\v 3 Ka nyongo nde nkpando bantangi baombia asii kotinga Mosa abea nkpa na pheki endu ana bodoko tinga endu ndeake.\v 4 Ngaa kisi endu nkpa ambe apheki kagea dye apheki kema bubui ande Mokonga. -======= -\v 1 ->>>>>>> 5fe0605e2b039fdb8e9f2e6cb94e49001714d8dc +\c 3 \v 2 \v 3 \v 4 \v 1 \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index 2c1c55e..c6c198b 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Wahebulania -======= -Ba Ebulania ->>>>>>> 5fe0605e2b039fdb8e9f2e6cb94e49001714d8dc +Ba Ebulania \ No newline at end of file