From 3966103f4146deddd673ee746aa2d15cd4651938 Mon Sep 17 00:00:00 2001 From: Daveyd_Matthew Date: Tue, 14 Nov 2023 15:41:26 -0500 Subject: [PATCH] =?UTF-8?q?Tue=20Nov=2014=202023=2015:41:26=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 --- 03/01.txt | 6 +----- 06/15.txt | 6 +----- 06/17.txt | 6 +----- 06/20.txt | 6 +----- 09/01.txt | 6 +----- 09/20.txt | 6 +----- 6 files changed, 6 insertions(+), 30 deletions(-) diff --git a/03/01.txt b/03/01.txt index 9a9ec269..aa722294 100644 --- a/03/01.txt +++ b/03/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 3 \v 1 õõõõOOOO -======= -\c 3 \v 1 Josue ed pherre phidujim maimua ober jim Sitim mua. majiieram anʉm Jordanag , maimua ich awia thumwe chi phobor Israel, thuba jieram anʉm chi dojã dich junawe ->>>>>>> 1079f5c9eca0cf71575d0555cd738be75eeb19cc +\c 3 \v 1 Josue ed pherre phidujim maimua ober jim Sitim mua. majiieram anʉm Jordanag , maimua ich awia thumwe chi phobor Israel, thuba jieram anʉm chi dojã dich junawe \ No newline at end of file diff --git a/06/15.txt b/06/15.txt index 18304a2a..083eb86e 100644 --- a/06/15.txt +++ b/06/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 khãai jua ab awia nʉmiingaai edau pheer phiidujieram anum, maimua wetjiieram anum phoboor igaau amach nacha wettaarjo awia, mag khãai gaai jua ad awia numi waujieeram mag khãai gaaita wetjiieram phoboor igaau jua ad awia nʉmiin gaai. \v 16 Mag khãai jua ad awia numiin gaaita, chi phatnaanau churo siirpuijieeram, Josueeu phoborag jaautaarjo: ¨¡Theeg oo abathun!, Ẽwamdamau paan nig chi phoboor deetarrai¨. -======= -\v 15 Magta khãai jua ab awia nʉmiingaai edau pheer phiidujieeram anum, maimua wetjiieram phoboor igaau amachdui nacha wautaarjo awia, mamu mug bes 7 besta waujieeram. Mag khaai ab eeta 7 bes phoboor igaau wet jieeram. \v 16 khaai 7 gaaita, chi phatnaanui amach churo theeg siirpui jieeram, , phoboor rag Josueeu jaautaarjo awia iekha jim: ''¡Theeg oo abat!, Ẽwamdamau paan nig phoboor deetaar aai''. ->>>>>>> 031ad2100a0ea13f3c02dbb105089551b27b2815 +\v 15 Magta khãai jua ab awia nʉmiingaai edau pheer phiidujieeram anum, maimua wetjiieram phoboor igaau amachdui nacha wautaarjo awia, mamu mug bes 7 besta waujieeram. Mag khaai ab eeta 7 bes phoboor igaau wet jieeram. \v 16 khaai 7 gaaita, chi phatnaanui amach churo theeg siirpui jieeram, , phoboor rag Josueeu jaautaarjo awia iekha jim: ''¡Theeg oo abat!, Ẽwamdamau paan nig phoboor deetaar aai''. \ No newline at end of file diff --git a/06/17.txt b/06/17.txt index f473783e..c550ba63 100644 --- a/06/17.txt +++ b/06/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Ẽwandamau jaaujim, chi phoboor magnaawia ag gaai jooba num khuun thunwe opuiyaag gau. Dauphiphirag siierum--Rahab magnaawia idui deg nun khuun peita nuuraagau--mamu ich dui emkhoon ich deg meenkha autarraai. \v 18 Mamʉ paan nau, nem inag wajapham aubaarram, thunwe anpuiyaagau, da abamja abeeg khabaaram. Paan nau aubeen mun, akhanagamta aubeegau Israel lak mag sim aawei thunwe nem inag anpui yaagau. \v 19 Thunwe phĩr jom madnaawia nem inag wajapham khʉʉn Ẽwandam athee khĩad araagau. mukhuun araagau Ẽwandam nem inag uurkha jem aar''. -======= -\v 18 Ẽwandamau jaaujim, chi phobor magnaawia ag gaai jooba nʉm khʉʉn thʉnwe opuiyaag gau. Dauphiphirag siierʉm--Rahab magnaawia idʉi deg nun khuun peita nʉrragau--mamʉ ich dʉi enkhoon ich deg meenkha autarraai. \v 17 Mamʉ paan nau, nem inag wajapham aubarram, thʉnwe anpuiyaagau, da abamja abeeg khabaaram. Paan nau aubeen mʉn, akhanagamta aubeegau Israel lak mag sim aawei thʉnwe nem inag anpui yaagau. \v 19 Thʉnwe phĩr jom madnaawia nem inag wajapham khʉʉn Ẽwandam athee khĩad araagau. mʉkhʉʉn araagau Ẽwandam nem inag ʉʉrkha jem aar''. ->>>>>>> 031ad2100a0ea13f3c02dbb105089551b27b2815 +\v 18 Ẽwandamau jaaujim, chi phobor magnaawia ag gaai jooba nʉm khʉʉn thʉnwe opuiyaag gau. Dauphiphirag siierʉm--Rahab magnaawia idʉi deg nun khuun peita nʉrragau--mamʉ ich dʉi enkhoon ich deg meenkha autarraai. \v 17 Mamʉ paan nau, nem inag wajapham aubarram, thʉnwe anpuiyaagau, da abamja abeeg khabaaram. Paan nau aubeen mʉn, akhanagamta aubeegau Israel lak mag sim aawei thʉnwe nem inag anpui yaagau. \v 19 Thʉnwe phĩr jom madnaawia nem inag wajapham khʉʉn Ẽwandam athee khĩad araagau. mʉkhʉʉn araagau Ẽwandam nem inag ʉʉrkha jem aar''. \ No newline at end of file diff --git a/06/20.txt b/06/20.txt index db0468d1..0a054c73 100644 --- a/06/20.txt +++ b/06/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Theeg oo ajieram thunwe chi churo iek unathaawei, mai chi thuursim buurjim mag chi thuursim burbaadei amach dug jieram, amach ã abdu aba dudurag maajieram. Mai amach dʉi juadu ajieeram chi phoboor. \v 21 Thũnwe phoboor ee jooba naarkhuun thookha puijieeram thuthuiyau--enkhoon maimua ʉʉn, chaain jooinnaan, bueyes, ovejas maimua burros. -======= -\v 20 Theeg oo ajieram thʉnwe chi churo iek ʉnathaawei, mai chi thuursim bʉrjim mag chi thuursim bʉrbaadei amach dug jieram, amach ã abdʉ aba dʉdurag maajieram. Mai amach dʉi juadu ajieeram chi phobor. \p \v 21 Thʉnwe phoboor ee jooba naarkhuun thookha puijieeram thuthuiyau--enkhoon maimua ʉʉn, chaain jooinnaan, bueyes, ovejas maigmua burros. ->>>>>>> 031ad2100a0ea13f3c02dbb105089551b27b2815 +\v 20 Theeg oo ajieram thʉnwe chi churo iek ʉnathaawei, mai chi thuursim bʉrjim mag chi thuursim bʉrbaadei amach dug jieram, amach ã abdʉ aba dʉdurag maajieram. Mai amach dʉi juadu ajieeram chi phobor. \p \v 21 Thʉnwe phoboor ee jooba naarkhuun thookha puijieeram thuthuiyau--enkhoon maimua ʉʉn, chaain jooinnaan, bueyes, ovejas maigmua burros. \ No newline at end of file diff --git a/09/01.txt b/09/01.txt index fc62822b..ab462aef 100644 --- a/09/01.txt +++ b/09/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 9 \v 1 Thʉ̃nwe chi papannaan jobaa naarkhʉ̃ʉn Jordan dakha, dursĩgayamkhʉ̃ʉn maigumua khutag eemkhʉ̃ʉn, maigmua pũas dakha nʉm khʉ̃ʉn,adjo agnãag jooba narkhʉ̃ʉn, Hititas naan, Amorreos naan, Cananeos naan,Fereseos naan, Heveseos naan maigmua Jebuseos naan. \v 2 Biirdu aujierram chi papannanau khukhãan maag Josue dʉi maigmua Israel naan dʉi. -======= -\c 9 \v 1 Thʉ̃nwe chi papannaan jobaa naarkhʉ̃ʉn Jordán dakha, dursĩgayam khʉ̃ʉn maigumua khutag eemkhʉ̃ʉn, maigmua pũas dakha nʉm khʉ̃ʉn,adjo agnãag jooba narkhʉ̃ʉn ,Hititas naan ,Amorreos naan, Cananeos naan, Fereseos naan, Heveseos naan maigmua Jebuseos naan. \v 2 Biirdu aujierram chi papannanau khukhãan maag Josué dʉi maigmua Israel naan dʉi. ->>>>>>> 54ef08b1f121c36ac3088a6da2837eaf425c2812 +\c 9 \v 1 Thʉ̃nwe chi papannaan jobaa naarkhʉ̃ʉn Jordán dakha, dursĩgayam khʉ̃ʉn maigumua khutag eemkhʉ̃ʉn, maigmua pũas dakha nʉm khʉ̃ʉn,adjo agnãag jooba narkhʉ̃ʉn ,Hititas naan ,Amorreos naan, Cananeos naan, Fereseos naan, Heveseos naan maigmua Jebuseos naan. \v 2 Biirdu aujierram chi papannanau khukhãan maag Josué dʉi maigmua Israel naan dʉi. \ No newline at end of file diff --git a/09/20.txt b/09/20.txt index e0d24ce9..b9e7c93d 100644 --- a/09/20.txt +++ b/09/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 \v 21 ñ -======= -\v 20 Mʉgta aam dʉi atarrau : maach gaai akhãrag waupi maagau maach deu Ẽwandam dauna iekhatar awai ,aan khõnnaa jooba pitarrau . \v 21 Chi papannanau oonag magjim:" ʉduraa aan jooba pitarrau".maagwai Gabionita naan beejieraan aan õbdau poot jemkhʉ̃ʉn maigmua aan do arjem khʉ̃ʉn thʉ̃mwe Israelita naan ithee, Paan papannanau jautarrjota naagau. ->>>>>>> 1079f5c9eca0cf71575d0555cd738be75eeb19cc +\v 20 Mʉgta aam dʉi atarrau : maach gaai akhãrag waupi maagau maach deu Ẽwandam dauna iekhatar awai ,aan khõnnaa jooba pitarrau . \v 21 Chi papannanau oonag magjim:" ʉduraa aan jooba pitarrau".maagwai Gabionita naan beejieraan aan õbdau poot jemkhʉ̃ʉn maigmua aan do arjem khʉ̃ʉn thʉ̃mwe Israelita naan ithee, Paan papannanau jautarrjota naagau. \ No newline at end of file