DCS-Mirror
/
es-419_gl_ULB1_gen
mirror of https://git.door43.org/es-419_gl/ULB1_gen
2
0
Fork 0
Files Issues Releases Wiki Activity See in Reader

Tue Feb 28 2017 17:51:13 GMT-0400 (AST)

This commit is contained in:
wendyc 2017-02-28 17:51:13 -04:00
parent 5acda805b9 5f8cbc98d0
commit f4025aa6c2
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
36/01.txt
View File

@ -1 +1,5 @@
<<<<<<< HEAD
\c 36 \v 1 Estos eran los descendientes de Esaú (también llamado Edom). \v 2 Esaú tomó esposas de entre los Canaanitas. Éstas eran sus esposas: Ada la hija de Elón el Heteo, Aholibama hija de Aná, la nieta de Zibeón el Heteo, \v 3 y Basemat, hija de Ismael, hermana de Nebaiot. \c 36 \v 1 Estos eran los descendientes de Esaú (también llamado Edom). \v 2 Esaú tomó esposas de entre los Canaanitas. Éstas eran sus esposas: Ada la hija de Elón el Heteo, Aholibama hija de Aná, la nieta de Zibeón el Heteo, \v 3 y Basemat, hija de Ismael, hermana de Nebaiot.
=======
\c 36 \v 1 Estos eran los descendientes de Esaú (también llamado Edom). \v 2 Esaú tomó esposas de entre los Canaanitas. Éstas eran sus espoas: Ada la hija de Elón el Heteo, Aholibama hija de Aná, la nieta de Zibeón el Heteo, \v 3 y Basemat, hija de Ismael, hermana de Nebaiot.
>>>>>>> 5f8cbc98d071bcb046841be0c630de9cddb98f79

10
LICENSE.md
View File

@ -12,6 +12,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
>>>>>>> 052b683e92a0a55a9dc26872888c94b817a3d35b >>>>>>> 052b683e92a0a55a9dc26872888c94b817a3d35b
======= =======
@ -34,10 +35,13 @@
>>>>>>> 7c29eb03de665bd6d090d62339e00d0facd4fe6e >>>>>>> 7c29eb03de665bd6d090d62339e00d0facd4fe6e
======= =======
>>>>>>> a76c3df34ba9dd36ab2d142b403f83906a94938e >>>>>>> a76c3df34ba9dd36ab2d142b403f83906a94938e
=======
>>>>>>> 5f8cbc98d071bcb046841be0c630de9cddb98f79
# License # License
## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/. This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/.
@ -47,6 +51,9 @@ This is a human-readable summary of (and not a substitute for) the [license](htt
======= =======
This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/). This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/).
>>>>>>> a76c3df34ba9dd36ab2d142b403f83906a94938e >>>>>>> a76c3df34ba9dd36ab2d142b403f83906a94938e
=======
This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/).
>>>>>>> 5f8cbc98d071bcb046841be0c630de9cddb98f79
### You are free to: ### You are free to:
@ -72,6 +79,7 @@ No warranties are given. The license may not give you all of the permissions nec
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
This PDF was generated using Prince (https://www.princexml.com/). This PDF was generated using Prince (https://www.princexml.com/).
======= =======
@ -160,3 +168,5 @@ This work is made available under a Creative Commons Attribution-ShareAlike 4.0
>>>>>>> 99beb78241f63bd9075c68f15ab320aed8303cb5 >>>>>>> 99beb78241f63bd9075c68f15ab320aed8303cb5
======= =======
>>>>>>> a76c3df34ba9dd36ab2d142b403f83906a94938e >>>>>>> a76c3df34ba9dd36ab2d142b403f83906a94938e
=======
>>>>>>> 5f8cbc98d071bcb046841be0c630de9cddb98f79

4
manifest.json
View File

@ -50,7 +50,8 @@
"Jose A. Torres Rodriguez", "Jose A. Torres Rodriguez",
"Lauranoemi07", "Lauranoemi07",
"Yarimar Ruiz", "Yarimar Ruiz",
"Wendy" "Wendy",
"Milady Díaz Cabello"
], ],
"finished_chunks": [ "finished_chunks": [
"front-title", "front-title",
@ -515,7 +516,6 @@
"35-26", "35-26",
"35-28", "35-28",
"36-title", "36-title",
"36-01",
"36-04", "36-04",
"36-06", "36-06",
"36-09", "36-09",