diff --git a/01/01.txt b/01/01.txt index bfd373dd..ebc1a687 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,6 +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. -FALTA PUNTO LUEGO DE "ESTÁ MUERTO" -======= -\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. ->>>>>>> f151f9724de8785f1e4d0843eab31d261d48f387 +\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. \ No newline at end of file diff --git a/04/08.txt b/04/08.txt index 447c7580..4998523f 100644 --- a/04/08.txt +++ b/04/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 \v 9 9 magtaar khʉr josue phẽkheerjim jãdacha mogdaũ docen ãb jordan. Jãdacham Sacerdote naan dũnui nʉ̃m aar baaudi phĨir deen aar nɄm aar maig ma mua jãaig keraajim isimjʉ awia. -======= -\v 8 POR TRANSCRIBIR \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. ->>>>>>> b1e974505ccef43034cf7f3ef490f0cfceba8ef2 +\v 8 POR TRANSCRIBIR \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/10/24.txt b/10/24.txt index 7087fb78..919996f9 100644 --- a/10/24.txt +++ b/10/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Maig amach deu aubewai chi rey naan Jusue aig thʉnwe birduaujierram õor Israelam khʉʉn, thʉnwe chi porpo maankhunag maigmua chi paparnaanag maach khukhuwa agau ajim: "khiirjuagatha puch bʉ aaimʉa pʉch odia mag beewia aan bʉ adach ʉn \v 25 ausoujim. -======= -\v 24 Maig amach deu aubewai chi rey naan Jusue aig thʉnwe birduaujierram õor Israelam khʉʉn, thʉnwe chi porpomaan khʉʉnag maigmua chi paparnaanag i dʉi majierram Josue aanig jaujim: " dʉnʉnba i odach ʉn" mai chadcha bewia amach bʉ aan odach ʉn dʉnʉunjierram. \v 25 Magtarr khʉr jaaujim: "oogkhamiet maigmua oo japhiermiet. Jua patheeg na õorja oogkhaag khabam. Mugta Ẽwandamʉa aagau ann dʉi pãar dʉi khʉkhag pãar khʉʉn dʉi." ->>>>>>> f151f9724de8785f1e4d0843eab31d261d48f387 +\v 24 Maig amach deu aubewai chi rey naan Jusue aig thʉnwe birduaujierram õor Israelam khʉʉn, thʉnwe chi porpomaan khʉʉnag maigmua chi paparnaanag i dʉi majierram Josue aanig jaujim: " dʉnʉnba i odach ʉn" mai chadcha bewia amach bʉ aan odach ʉn dʉnʉunjierram. \v 25 Magtarr khʉr jaaujim: "oogkhamiet maigmua oo japhiermiet. Jua patheeg na õorja oogkhaag khabam. Mugta Ẽwandamʉa aagau ann dʉi pãar dʉi khʉkhag pãar khʉʉn dʉi." \ No newline at end of file diff --git a/manifest.json b/manifest.json index fc55285f..d6401dea 100644 --- a/manifest.json +++ b/manifest.json @@ -48,6 +48,7 @@ ], "finished_chunks": [ "01-title", + "01-04", "01-08", "01-10", "01-12", @@ -130,7 +131,9 @@ "09-11", "09-14", "09-16", + "09-18", "09-20", + "09-22", "09-24", "09-26", "10-title", @@ -147,6 +150,17 @@ "10-18", "10-20", "10-22", + "10-24", + "10-26", + "10-28", + "10-29", + "10-31", + "10-33", + "10-34", + "10-36", + "10-38", + "10-40", + "10-42", "11-title", "12-title", "13-title", @@ -163,28 +177,8 @@ "13-20", "14-title", "15-title", - "16-title", - "17-title", - "18-title", - "19-title", - "20-title", - "21-title", - "22-title", - "23-title", - "24-title", - "09-18", - "09-22", - "10-26", - "10-28", - "10-29", - "10-31", - "10-33", - "10-34", - "10-36", - "10-38", - "10-40", - "10-42", - "17-01", + "15-03", + "15-05", "15-42", "15-45", "15-48", @@ -192,9 +186,16 @@ "15-55", "15-60", "15-63", + "16-title", + "17-title", + "17-01", + "18-title", "18-03", - "10-24", - "15-03", - "15-05" + "19-title", + "20-title", + "21-title", + "22-title", + "23-title", + "24-title" ] } \ No newline at end of file