From ea6d96b2aecb23fa4a3ac04865bcde864b5e41ab Mon Sep 17 00:00:00 2001 From: Rayxi_cabarcas Date: Mon, 13 Nov 2023 21:52:04 -0500 Subject: [PATCH] =?UTF-8?q?Mon=20Nov=2013=202023=2021:52:03=20GMT-0500=20(?= =?UTF-8?q?hora=20est=C3=A1ndar=20de=20Colombia)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 01/01.txt | 6 +----- 02/01.txt | 6 +----- 02/04.txt | 6 +----- 03/14.txt | 6 +----- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/01/01.txt b/01/01.txt index 83d3983e..a2c1df06 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 \v 2 \v 3 Moise tho tarkur ,jose ieba nun ,ewandamua mag jim ,pu rig ta uepeyaipan ajim chi juapa,maimua peta aji mua dur jautar ar. -======= -\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. ->>>>>>> deaf4007beca4127df371828c49b076ff8e4d9d9 +\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/02/01.txt b/02/01.txt index 38813baf..0ab10435 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 2 \v 1 Josue, Nun iewaa anum, jãguataa õor Sitimpien numi merãa chogjim anum. Chi õor numi wetju nawe ichdeu magjim: "Petathu jẽb oon maimua Jeriko jẽb akho oobathu ajim anum." Magnaa chi õor numi chadcha ereujiieram anum chi jẽb oonmarr ee ʉʉi daujã phiphiirmie Rahab anum, di aita thʉba jiieram anum. \v 2 Maimua chi Rei Jerikoonag jaaupuijiieram anum. "oobat enkhooin numi Israelpien maach jẽb oon beejiieram anum". \v 3 Maimua chi Rei Jerikoonau iek jaapuijim anum chi ʉʉi Rahab anumag: "pʉ di ai enkhooin thʉbatarr khʉʉn jʉr apui puch aigmua jãkhʉʉnan maach jẽb oonbeetarr khʉnau." -======= -\c 2 \v 1 Josue, Nun iewaa anʉm, jãguataa õor Sitimpien numi merãa chogjim anum. Chi õor numi wetju nawe ichdeu magjim: "jẽb oon petat maimua Jeriko jẽb akho oobathʉ ajim anʉm". Magnaa chi õor numi chadcha ereujiieram anʉm chi jẽb oon mag oonmarr ee ʉʉi dau phipirag sim ai Rahab anʉm, di aita thʉba jiieram anum. \v 2 Maimua chi Rei Jerikoonag jaaupuijiieram anum. "oobat enkhooin numi Israelpien maach jẽb oon beejiieram anʉm". \v 3 Maimua chi Rei Jerikoonau iek jaapuijim anʉm chi ʉʉi Rahab anʉmag: "pʉ di ai emkhooin thʉbatarr khʉʉn jʉr apʉi pʉch aigmua jãkhʉʉnan maach jẽb oonbeetarr khʉnau ". ->>>>>>> e167b3361fef590dacbbf4492c47f6971b62edff +\c 2 \v 1 Josue, Nun iewaa anum, jãguataa õor Sitimpien numi merãa chogjim anum. Chi õor numi wetju nawe ichdeu magjim: "Petathu jẽb oon maimua Jeriko jẽb akho oobathu ajim anum." Magnaa chi õor numi chadcha ereujiieram anum chi jẽb oonmarr ee ʉʉi daujã phiphiirmie Rahab anum, di aita thʉba jiieram anum. \v 2 Maimua chi Rei Jerikoonag jaaupuijiieram anum. "oobat enkhooin numi Israelpien maach jẽb oon beejiieram anum". \v 3 Maimua chi Rei Jerikoonau iek jaapuijim anum chi ʉʉi Rahab anumag: "pʉ di ai enkhooin thʉbatarr khʉʉn jʉr apui puch aigmua jãkhʉʉnan maach jẽb oonbeetarr khʉnau." \ No newline at end of file diff --git a/02/04.txt b/02/04.txt index cb4cef40..9158df3d 100644 --- a/02/04.txt +++ b/02/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Mamʉ chi uuiyau makhʉʉn enkhooin numi mẽerpuyaanta majim anum. Maimua chi uuiyag magjim anum: "Chadcha, mʉ ai makhʉʉn enkhooin beejiieram, mamu mua khauba uajim jãmaamuata beejiera. \v 5 Amach chi õor wetjiieram kheeumamua, chi phobor thãarju nawe. Mua khabam, jãmagta wetjiiera. Pua ãar omdee jupai manaa ẽkha aujuarau." -======= -\v 4 Mamʉ chi uuiyau makhʉʉn emkhooin numi warrwia mẽer aujim anʉm. Maimua chi uuiyag magjim anʉm: "Chadcha, mʉ ai makhʉʉn eʉkhooin beejiieram, mamʉ mua khauba ʉajim jãmaamuata beejierra. \v 5 Amach wetjiieram kheeumamʉa, chi phobor thãarju nawe. Mua khabam, jãmagta wetjiiera. Pua am ẽudee jupai mamʉn ẽkha auju". ->>>>>>> e167b3361fef590dacbbf4492c47f6971b62edff +\v 4 Mamʉ chi uuiyau makhʉʉn enkhooin numi mẽerpuyaanta majim anum. Maimua chi uuiyag magjim anum: "Chadcha, mʉ ai makhʉʉn enkhooin beejiieram, mamu mua khauba uajim jãmaamuata beejiera. \v 5 Amach chi õor wetjiieram kheeumamua, chi phobor thãarju nawe. Mua khabam, jãmagta wetjiiera. Pua ãar omdee jupai manaa ẽkha aujuarau." \ No newline at end of file diff --git a/03/14.txt b/03/14.txt index ced37a4b..9fd1ea1f 100644 --- a/03/14.txt +++ b/03/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Magma khʉʉn wounaan Jordan ee dʉrba diicha wei chi phadnaanauta Ẽwandam baaudi naa armajiieram. \v 15 Mag tarkhʉr barimawia chi waartarr khʉʉn chi baaudi jordanag aan bʉ oomta sĩejim doo igauwam dou (nemjõ chejem jarta do pomta thunum ee Ẽwandamua an wai diich ich guapa om khiir) \v 16 do pooma a deweita maigta chi phuas nana ade jim maan adan siegeramua doo nana siejim phobor seretanar maig muaja barsiejim ´´phuas dau neguev ar´´phuas salado ´´ maigta oon durba jieram Jerico dakhapai -======= -\v 14 Magma khʉʉn wounaan Jordan ee dʉrba diicha wei chi phadnaanauta Ẽwandam baaudi naata armajiieram. \v 15 Mag tarkhʉr barimawia chi waartarr khʉʉn chi baaudi Jordanag aan bʉ oomta sĩejim doo igauwam dou [nemjõ chejem jarta do pomta thunum ee Ẽwandamua an wai diich jim ich guapa om khiir] \v 16 do pooma a deweita maigta chi phuas nana ade jim maan adan siegeramua doo nana siejim phobor seretanar maig muaja barsiejim ´´phuas dau neguev ar´´phuas salado ´´ maigta oon durba jieram Jerico dakhapai. ->>>>>>> a76bd9aaefa81ef768afac19eafd000f3f637fb5 +\v 14 Magma khʉʉn wounaan Jordan ee dʉrba diicha wei chi phadnaanauta Ẽwandam baaudi naata armajiieram. \v 15 Mag tarkhʉr barimawia chi waartarr khʉʉn chi baaudi Jordanag aan bʉ oomta sĩejim doo igauwam dou [nemjõ chejem jarta do pomta thunum ee Ẽwandamua an wai diich jim ich guapa om khiir] \v 16 do pooma a deweita maigta chi phuas nana ade jim maan adan siegeramua doo nana siejim phobor seretanar maig muaja barsiejim ´´phuas dau neguev ar´´phuas salado ´´ maigta oon durba jieram Jerico dakhapai. \ No newline at end of file