diff --git a/07/08.txt b/07/08.txt index 94df32b..4da430b 100644 --- a/07/08.txt +++ b/07/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Ovipuka ovikohoke nu imbi mbiheri ovikohoke, ouzera, no vikumguzuke mbi kunguzuka kombanda ehi, \v 9 vivari vivari,otjitume no tjikaze, veja ku Noah nu avihiti mo tjitendeze, otja imba Mukuru pa raa Noah. \v 10 Nu otji pakara kutja kombunda o majuva hambombari,omeva uo mupupo jeja kombanda jehi. -======= -\v 8 Ovipuka ovikoheke na mbiheri ovikoheke,ouzera,no vikokozoke avihe kombanda jehi, \v 9 Vivari vivari,otja Mukuru mba raera Noah. \v 10 Nu otjipakara kutja kombunda omajuva hambombari,omeva uo mupupo jeja kombanda jehi. ->>>>>>> fe8d2bdf92345d4422400df86924a6b923858908 +\v 8 Ovipuka ovikoheke na mbiheri ovikoheke,ouzera,no vikokozoke avihe kombanda jehi, \v 9 Vivari vivari,otja Mukuru mba raera Noah. \v 10 Nu otjipakara kutja kombunda omajuva hambombari,omeva uo mupupo jeja kombanda jehi. \ No newline at end of file diff --git a/07/11.txt b/07/11.txt index fd1c8f0..b88bd2b 100644 --- a/07/11.txt +++ b/07/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Mo zo mbura omasere hamboumue zo hupo ja Noah,mo mueze oitja vari, ejuva oritja murongo na hambombari ko mueze, mejuva ndo, otuharui toure koto atu paturuka, nu utuiho tue jeru tua patu ruka. \v 12 Ombura aji utu okuroka mo uje oure omajuva omirongo vine no utuku omirongo vine. -======= -\v 11 Mozumbura omasere hamboumue zo hupo ja Noah,mo mueze uo itjavari,mejuva o ritja morungo na hambombari ko mueze,mejuva ndo,otuharui atuhe to muronga atu paturuka,otuho tuejuru tuapaturuka. \v 12 Ombura jauta oku roka mo uje oure uo majuva omirongo vine. ->>>>>>> fe8d2bdf92345d4422400df86924a6b923858908 +\v 11 Mo zo mbura omasere hamboumue zo hupo ja Noah,mo mueze oitja vari, ejuva oritja murongo na hambombari ko mueze, mejuva ndo, otuharui toure koto atu paturuka, nu utuiho tue jeru tua patu ruka. \v 12 Ombura aji utu okuroka mo uje oure omajuva omirongo vine no utuku omirongo vine. \ No newline at end of file