diff --git a/20/09.txt b/20/09.txt index 0e1e4f8..982607f 100644 --- a/20/09.txt +++ b/20/09.txt @@ -1 +1,5 @@ -\v 9 \v 10 Guyecabe guidxilayú ne guluule'cabe ca layú xti'ca xpinni Diuxi, ra nuu guidxi ni nadxii Diuxi. Biete huaxa bele de guibá' ne bixuuxe laacabe. Binnidxaba' ni gudxite laacabe que la?, guluu bi cabe laa ndaani' bele, ra bilaacabe mani ngola que ne dxa profeta ni cadi dxandi' que. Raque ziuucabe zadi'dicabe yuuba' naro' dxi ne gueela' guiraxixe dxi ne ma que ziuudi'dxi guireecabe raque. \ No newline at end of file +<<<<<<< HEAD +\v 9 \v 10 Guyecabe guidxilayú ne guluule'cabe ca layú xti'ca xpinni Diuxi, ra nuu guidxi ni nadxii Diuxi. Biete huaxa bele de guibá' ne bixuuxe laacabe. Binnidxaba' ni gudxite laacabe que la?, guluu bi cabe laa ndaani' bele, ra bilaacabe mani ngola que ne dxa profeta ni cadi dxandi' que. Raque ziuucabe zadi'dicabe yuuba' naro' dxi ne gueela' guiraxixe dxi ne ma que ziuudi'dxi guireecabe raque. +======= +\v 9 \v 10 laacabe uyecabe lu guidxi layuca ne ulucabe +>>>>>>> eb16a4964497cfcdfad6b1d127c4ff7d83ac2c7d diff --git a/20/13.txt b/20/13.txt index aa7b34f..54f7178 100644 --- a/20/13.txt +++ b/20/13.txt @@ -1 +1,5 @@ -\v 13 \v 14 \v 15 niza'do que bidxi gueta ca gueetu ni nu ndani. \ No newline at end of file +<<<<<<< HEAD +\v 13 \v 14 \v 15 niza'do que bidxi gueta ca gueetu ni nu ndani. +======= +\v 13 \v 14 \v 15 niza'doca bixhi gueta cani guti ndani. Enda guti ne gabia bidxi gueta cani nu ndani ni neca ni ma guti que bizu huacabe ne biyacabe xi ira bi'nni cabe. genda guti ne gabia gulacani ndani guigu de bele. ndinga iropa genda guti- gigu de gui. ne palaa tobi queni dxela lu guichi de enda nabani, laabe zalabe ndani gigu de bele. +>>>>>>> eb16a4964497cfcdfad6b1d127c4ff7d83ac2c7d diff --git a/LICENSE.md b/LICENSE.md index 3ea23a0..78af7e0 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -2,10 +2,13 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a7646f02ac4bc6940526cc33ee364d7d7dd83c21 ======= >>>>>>> 5ba3859fae74a97a1d6484ba3f1bbcf0dc1a6394 +======= +>>>>>>> eb16a4964497cfcdfad6b1d127c4ff7d83ac2c7d # License ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) @@ -34,6 +37,7 @@ You do not have to comply with the license for elements of the material in the p No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ## Creative Commons Attribution-ShareAlike 4.0 International @@ -78,3 +82,5 @@ This PDF was generated using Prince (https://www.princexml.com/). >>>>>>> a7646f02ac4bc6940526cc33ee364d7d7dd83c21 ======= >>>>>>> 5ba3859fae74a97a1d6484ba3f1bbcf0dc1a6394 +======= +>>>>>>> eb16a4964497cfcdfad6b1d127c4ff7d83ac2c7d diff --git a/manifest.json b/manifest.json index cdfab10..c277b09 100644 --- a/manifest.json +++ b/manifest.json @@ -38,7 +38,8 @@ "Michael A. Rodriguez", "tech", "Emanuel Antonio Ruiz", - "Brenda " + "Brenda ", + "Julio Melquiades Allende irrisari" ], "finished_chunks": [ "front-title", @@ -152,7 +153,6 @@ "20-04", "20-05", "20-07", - "20-09", "20-11" ] } \ No newline at end of file