diff --git a/05/01.txt b/05/01.txt index 7e0dea0..3fe7a04 100644 --- a/05/01.txt +++ b/05/01.txt @@ -1,9 +1,5 @@ -<<<<<<< HEAD \c 5 (Mudradev Rigav Ani Yah Makomain Gu Israel Grae Yehuda Grae Hayam Makomain) \v 1 "Mudrade Imam rigav oh,eke darimdia,Israel rigav oh masomhae nahadimdian!raja utuv rigav sadav vidamdien.Yais ohi sasa vae go wan neane.Iti go ni makomain wan esevah bae go sisiv kahane varakemane vae vae tae iti masar anaev ke bivorhama kahane disir ke. \v 2 Manae vae tae iti tav- -tav vohav bohos ke gon-gon nekotae nohov ni usadi makon nahav ke -======= -\c 5 (Mudradev Rigav Ani Yah Makomain Gu Israel Grae Yehuda Grae Hayam Makomain) \v 1 "Mudrade rigav oh,eke darimdia,Israel rigav oh masomhae nahadimdian!raja utuv rigav sadav vidamdien.Yais ohi sasa vae go wan neane.Iti go ni makomain wan esevah bae go sisiv kahane varakemane vae vae tae iti masar anaev ke bivorhama kahane disir ke. \v 2 Manae vae tae iti tav-tav vohav bohos ke gon-gon nekotae nohov ni usadi makon nahav ke ->>>>>>> 7f755315b0818cc93771e121c82d11ed364407bb +tav vohav bohos ke gon-gon nekotae nohov ni usadi makon nahav ke \ No newline at end of file diff --git a/05/03.txt b/05/03.txt index 5573431..dbea0cd 100644 --- a/05/03.txt +++ b/05/03.txt @@ -1,8 +1,4 @@ -<<<<<<< HEAD \v 3 Novae Efraim,nyam Israel tae noke onahanae bakado haser.Manae enaigu bae Efraim go ni iti donai ke make gu Israel ke darimun ken disir ke \v 4 Wan-wan eseke nahav ni kohomnae mahomae iti ke nahav ni haur navo -ke havtavi yaka haser ke iti donai vinan yahaya naha utuv ke dana komain nenae.Nahav ni Myaokodon ke Nyamkohaser -======= -\v 3 Novae Efraim,nyam Israel tae noke anahanae bakado haser.Manae enaigu bae Efraim go ni iti donai ke make gu Israel ke darimun ken disir ke \v 4 Wan-wan eseke nahav ni kohomnae mahomae iti ke nahav ni haur navo ke havtavi yaka haser ke iti donai vinan yahaya naha utuv ke dana komain nenae.Nahav ni Huar navo ke vinan gang.Mana bana komain. ->>>>>>> 7f755315b0818cc93771e121c82d11ed364407bb +ke havtavi yaka haser ke iti donai vinan yahaya naha utuv ke dana komain nenae.Nahav ni Myaokodon ke Nyamkohaser \ No newline at end of file diff --git a/manifest.json b/manifest.json index 683f85f..7c13ae8 100644 --- a/manifest.json +++ b/manifest.json @@ -66,6 +66,8 @@ "04-15", "04-17", "05-title", + "05-01", + "05-03", "08-title", "09-title", "12-title",