diff --git a/04/03.txt b/04/03.txt index d820e91..9aeea8a 100644 --- a/04/03.txt +++ b/04/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Nejjata iranakua yatsevapona, ikatsia dajjita pomonae jinavonopa yavitanetsoponae; nejjata bestiavi wayapjo pejinavonopaevi pe punaevi yajava atjübütalsia, menepijivi yajava tüpapona. -======= -\v 3 Nejjata ira nakua yatsevapona, ikatsia dajjita pamonae jinavonopa yavitanetsaponae; nejjata bestiavi wayafo pejinovopaevi pe punaevi yajava atjübütatsia, menepijivi yajavo tüpapona. ->>>>>>> 96cd3ff4943c6cf308086141b57453ebb661e244 +\v 3 Nejjata ira nakua yatsevapona, ikatsia dajjita pamonae jinavonopa yavitanetsaponae; nejjata bestiavi wayafo pejinovopaevi pe punaevi yajava atjübütatsia, menepijivi yajavo tüpapona. \ No newline at end of file diff --git a/04/04.txt b/04/04.txt index 5a751ab..9494018 100644 --- a/04/04.txt +++ b/04/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 \v 5 Beitsijane pütsa kaejiviyota renatsipae, pebijia leveisi pekapatsiyeniva; putsa kaejiviyo ata pa kapatame pebijia liversi pejumejava, tsipeji pajjumübaja -======= -\v 4 Betsijane pütsa kaejiviyota renatsipae, pebijia leveisi pekapatsi yeniva; putsa kaejiuiyo ata pa kapatame pebijia liveisi pejumejava tsipeji pajjamü baja sacerdotevi, tsipeji bajara pamonae baja. \v 5 Pajjamü sacerdotevi apo pajumeku ü nütsimütsane dajjita malakabi, profetavi yajava apo jume kowünütsitsane pajjamü yaja merevita, nejjata jjonü Israel tomara wereverekae ejjanaenajü pakuenia be ena tsane. ->>>>>>> 96cd3ff4943c6cf308086141b57453ebb661e244 +\v 4 Betsijane pütsa kaejiviyota renatsipae, pebijia leveisi pekapatsi yeniva; putsa kaejiuiyo ata pa kapatame pebijia liveisi pejumejava tsipeji pajjamü baja sacerdotevi, tsipeji bajara pamonae baja. \v 5 Pajjamü sacerdotevi apo pajumeku ü nütsimütsane dajjita malakabi, profetavi yajava apo jume kowünütsitsane pajjamü yaja merevita, nejjata jjonü Israel tomara wereverekae ejjanaenajü pakuenia be ena tsane. \ No newline at end of file diff --git a/manifest.json b/manifest.json index b94b219..4152325 100644 --- a/manifest.json +++ b/manifest.json @@ -52,6 +52,8 @@ "03-04", "04-title", "04-01", + "04-03", + "04-04", "04-06", "04-08", "04-10",