diff --git a/06/10.txt b/06/10.txt index a06d59b3..e5e93184 100644 --- a/06/10.txt +++ b/06/10.txt @@ -1 +1 @@ -\v 10 Mamʉ Josueeu jaaujim phoborag: ¨Khiuu ereuphubaad murua theeg oobad abamaar¨. \v 11 Mugta Josueeu waaujim chi arka Ẽwandamden phoboor igaau mamkhiin khãai ab. Deeu magwia dug jieeram di wausimee khayaag athee. \ No newline at end of file +\v 10 Mamʉ Joseeu phoboor rag jaau jim anʉm: ''khiʉʉ ereeu phubaad, khaai ãb amua paanig theeg oo abat aaweita paan theen oo aagau ajim anʉm''. \v 11 Magta khaai ab ee Josueeu waujim Ẽwandam arka phoboor igaau weisiagathee. maimua dug jieeram di eu simee magee khai jieeram anʉm. \ No newline at end of file diff --git a/06/15.txt b/06/15.txt index 65a5f31c..18304a2a 100644 --- a/06/15.txt +++ b/06/15.txt @@ -1 +1,5 @@ -\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¨. \ No newline at end of file +<<<<<<< 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 diff --git a/06/17.txt b/06/17.txt index c03b1329..f473783e 100644 --- a/06/17.txt +++ b/06/17.txt @@ -1 +1,5 @@ -\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''. \ No newline at end of file +<<<<<<< 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 diff --git a/06/20.txt b/06/20.txt index c2544537..db0468d1 100644 --- a/06/20.txt +++ b/06/20.txt @@ -1 +1,5 @@ -\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. \ No newline at end of file +<<<<<<< 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 diff --git a/06/26.txt b/06/26.txt index 29dcb68b..df76375b 100644 --- a/06/26.txt +++ b/06/26.txt @@ -1 +1,5 @@ -\v 26 Ẽwandamdauna mua iekhapuikhim: ''deeu chi wonanu chi phoboor Jericó wauban mag chaain khaiba aagau chi naam thuursimee obeerpuiyaagau chi eudeem meegau obeer jem ai''. \v 27 Mai chi Ẽwandam Josué dʉi sieejim mai ithʉn jeb gaai khaujieeram. \ No newline at end of file +<<<<<<< HEAD +\v 26 Ẽwandamdauna mua iekhapuikhim: ''deeu chi wonanu chi phoboor Jericó wauban mag chaain khaiba aagau chi naam thuursimee obeerpuiyaagau chi eudeem meegau obeer jem ai''. \v 27 Mai chi Ẽwandam Josué dʉi sieejim mai ithʉn jeb gaai khaujieeram. +======= +\v 26 :Ẽwandamdauna mua iekhapuikhim: ''deeu chi wounnau chi phoboor Jericó wauban mag chaain khaiba aagau chi naam thuursimee obeerpuiyaagau chi eudeem meegau obeer jem ai''. \p \v 27 Mai chi Ẽwandam Josué dʉi sieejim mai ithʉn jeb gaai khaujieeram. +>>>>>>> 031ad2100a0ea13f3c02dbb105089551b27b2815 diff --git a/manifest.json b/manifest.json index 99cb8fd4..cf8d97a9 100644 --- a/manifest.json +++ b/manifest.json @@ -62,11 +62,8 @@ "04-17", "04-22", "05-title", - "06-17", - "06-20", "06-23", "06-25", - "06-26", "07-title", "08-title", "08-08", @@ -111,6 +108,7 @@ "04-10", "04-12", "04-15", - "04-19" + "04-19", + "06-10" ] } \ No newline at end of file