diff --git a/01/01.txt b/01/01.txt index 1dfd81af..a2c1df06 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 Moisés meetar khurr mʉgtà ajim, chi ihog Ẽwandanden, Ẽwandamau iekhajim Josueeg Nun iewa, Moisés dʉi nʉrraa jeemau, Mug jim: \v 2 "Moises, mʉ chog mee jim mag sim aawei phiidiba, durbaba mug Jordan gaar, pʉ mai mua chi phoboor khʉʉn ar mua jẽb deetarr gar Israel pienaag. \v 3 Paanau dʉnʉi bam jẽb paan den ajú Pʉrug mʉruu deejim, Moises dee taorjo awai. -======= -\c 1 \v 1 Moises meetar khurr mʉgtà ajim, chi ihog Ēwandanden, Ēwandamau iekhajim Josueeg Nun iewa, Moises dʉi nʉrraa jeemau, Mug jim: \v 2 "Moises, mʉ chog mee jim mag sim aawei phiidiba, durbaba mug Jordan gaar, pʉ mai mua chi phoboor khʉʉn ar mua jēb deetarr gar Israel pienaag. \v 3 Paanau dʉnʉi bam jēb paan den ajú Pʉrug mʉruu deejim, Moises dee taorjo awai. ->>>>>>> d216cf4b0cff4a66337734d2eafc87e7d512c647 +\c 1 \v 1 Moises meetar khurr mʉgtà ajim, chi ihog Ēwandanden, Ēwandamau iekhajim Josueeg Nun iewa, Moises dʉi nʉrraa jeemau, Mug jim: \v 2 "Moises, mʉ chog mee jim mag sim aawei phiidiba, durbaba mug Jordan gaar, pʉ mai mua chi phoboor khʉʉn ar mua jēb deetarr gar Israel pienaag. \v 3 Paanau dʉnʉi bam jēb paan den ajú Pʉrug mʉruu deejim, Moises dee taorjo awai. \ No newline at end of file diff --git a/03/01.txt b/03/01.txt index 0e71c5fc..0b750dea 100644 --- a/03/01.txt +++ b/03/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 3 \v 1 Josue ed pherre phidʉjim maimua oberjim Sitim mua. majierram anʉm Jordanag , maimua ich awia thumwe chi phobor Israel, thʉbajieram anʉm chi dojã dichjunawe -======= -\c 3 \v 1 Josue phidʉjim Edauphergar maimua wetjim Sitim mua oberjim. Magnaa petajim anʉm Jordan dojã garmua ich magma phobar thumwe Israelpien magtha thʉbajierram chi dojã dichaag athe. ->>>>>>> d216cf4b0cff4a66337734d2eafc87e7d512c647 +\c 3 \v 1 Josue phidʉjim Edauphergar maimua wetjim Sitim mua oberjim. Magnaa petajim anʉm Jordan dojã garmua ich magma phobar thumwe Israelpien magtha thʉbajierram chi dojã dichaag athe. \ No newline at end of file diff --git a/03/07.txt b/03/07.txt index 08dbb5b8..c6655763 100644 --- a/03/07.txt +++ b/03/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Ẽwamdamua Josueg jaujim: Mug ed mua oopiju Israel dauna pʉ enkõõi wuajapham khaphu a juara Moises dʉi chitaarjo pu dʉija chitaju ajim. \v 8 pua jawuagau saserdotenaan aaram khĩir chi baaudi phĩn den , barimawai Jordan igar paar nagau thethe dosig Jordanar. -======= -\v 7 \v 8 Ẽwamdamua Josueg juajim: Mʉg ed mua oopiuju Israel dauna pʉ enkõoi wajapham khaphʉ ajuaarau Moises dʉi chitaarjo pʉ dʉija chitajo. ->>>>>>> d216cf4b0cff4a66337734d2eafc87e7d512c647 +\v 7 Ẽwamdamua Josueg jaujim: Mug ed mua oopiju Israel dauna pʉ enkõõi wuajapham khaphu a juara Moises dʉi chitaarjo pu dʉija chitaju ajim. \v 8 pua jawuagau saserdotenaan aaram khĩir chi baaudi phĩn den , barimawai Jordan igar paar nagau thethe dosig Jordanar. \ No newline at end of file diff --git a/04/08.txt b/04/08.txt index 0af39b88..8f735026 100644 --- a/04/08.txt +++ b/04/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Chi phõbor Israel pienau waujierran Josueg mag jaau tarrjo awia. amach mogdau poordu aujieram docen ãb Jordan, dosig igawam Ẽwandamau Josueg Jaautar to awia. Amacch dʉi chi mokdau aukhejerriam amach khapanag oonaawia makhʉʉn khodnuan Israel phobor eem khʉʉn ajim. \v 9 Magwia Josueu mok doce phekhasiu jim Jordán Jadacha, Mag aaita Sacedote naan dʉnui jieram maigmua opheugai waiwenurajieram baaudi phĩirden dʉi. Mag altar chagtha mʉgwai oowai naajem. -======= -\v 8 \v 9 Chi phõbor Israel pienau waujierran Josueg mag jaautarrjo awia. amach mokdau poordu aujieram docen ãb Jordan, dosig igawam Ẽwandamau Josueg Jaautarjo awia. Amach dʉi chi mokdau aukhejierram amach khapanag oonaawia makhʉʉn khodnaan Israel phobor eem khʉʉn ajim. ->>>>>>> d216cf4b0cff4a66337734d2eafc87e7d512c647 +\v 8 Chi phõbor Israel pienau waujierran Josueg mag jaau tarrjo awia. amach mogdau poordu aujieram docen ãb Jordan, dosig igawam Ẽwandamau Josueg Jaautar to awia. Amacch dʉi chi mokdau aukhejerriam amach khapanag oonaawia makhʉʉn khodnuan Israel phobor eem khʉʉn ajim. \v 9 Magwia Josueu mok doce phekhasiu jim Jordán Jadacha, Mag aaita Sacedote naan dʉnui jieram maigmua opheugai waiwenurajieram baaudi phĩirden dʉi. Mag altar chagtha mʉgwai oowai naajem. \ No newline at end of file diff --git a/05/06.txt b/05/06.txt index e14ecd4b..7a77d9a2 100644 --- a/05/06.txt +++ b/05/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Magta chi phobor Israel pien wenʉrrajierram desierto ee kuarentena ayos, magta thumwe chi khukhajem khʉʉn meekhajierram maach Ẽwandam iek ʉrhabathargaimua. Magta maach Ẽwandamua jaujim irua bʉrja chi jeb oopibam ajim anʉm, jooinag jeb deeju athar, mag jeb gai thʉnʉm leche miel, nempom khĩrphierragam deesim. \v 7 Makhʉʉn meethar khʉʉn chaanta, ma Aayau ich jeb deeju atharr ar, magartha ausujim, mʉkhʉʉnta Josue me eu phʉrbichthar khʉʉnau, makhʉʉntha khʉd ee wetbamua me eu pod thʉbaatharkhʉʉn ajim. -======= -\v 6 Magta chi phobor Israel pien wenʉrrajierram desierto ee kuarenta ayos, magta thumwe chi khʉkhajem khʉʉn meekhajierram maach Ẽwandam iek ʉrhabathargaimua. Magta maach Ẽwandamua jaujim irua bʉrja chi jẽb oopibam ajim anʉm, jooinag jẽb deeju athar, mag jẽb gai thʉnʉm leche, miel, nempom khĩrphierragam deesim. \v 7 ->>>>>>> d216cf4b0cff4a66337734d2eafc87e7d512c647 +\v 6 Magta chi phobor Israel pien wenʉrrajierram desierto ee kuarentena ayos, magta thumwe chi khukhajem khʉʉn meekhajierram maach Ẽwandam iek ʉrhabathargaimua. Magta maach Ẽwandamua jaujim irua bʉrja chi jeb oopibam ajim anʉm, jooinag jeb deeju athar, mag jeb gai thʉnʉm leche miel, nempom khĩrphierragam deesim. \v 7 Makhʉʉn meethar khʉʉn chaanta, ma Aayau ich jeb deeju atharr ar, magartha ausujim, mʉkhʉʉnta Josue me eu phʉrbichthar khʉʉnau, makhʉʉntha khʉd ee wetbamua me eu pod thʉbaatharkhʉʉn ajim. \ No newline at end of file