Fri Feb 10 2017 13:08:18 GMT-0300 (Argentina Standard Time)

This commit is contained in:
monchotech 2017-02-10 13:08:18 -03:00
commit 710bbaf287
3 changed files with 23 additions and 2 deletions

View File

@ -1 +1,5 @@
\c 1 \v 1 En el principio Dios creó los cielos y la tierra. \v 2 La tierra estaba sin forma y vacía. La oscuridad estaba sobre la superficie del abismo. El Espíritu de Dios se movía sobre la superficie de las aguas.
<<<<<<< HEAD
\c 1 \v 1 En el principio Dios creó los cielos y la tierra. \v 2 La tierra estaba sin forma y vacía. La oscuridad estaba sobre la superficie del abismo. El Espíritu de Dios se movía sobre la superficie de las aguas.
=======
2\v 1 vvbvc\v 2
>>>>>>> 0bcf4ebed9127d135c9d6c2af27ce36f6044697f

View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
# License
## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
@ -25,3 +26,20 @@ The licensor cannot revoke these freedoms as long as you follow the license term
You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
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.
=======
## License:
This work is made available under a Creative Commons Attribution-ShareAlike 4.0 International License (http://creativecommons.org/licenses/by-sa/4.0/).
### You are free to:
**Share** - copy and redistribute the material in any medium or format
**Adapt** - remix, transform, and build upon the material for any purpose, even commercially.
### Under the following conditions:
**Attribution** - You must attribute the work as follows: "Original work available at https://door43.org/." Attribution statements in derivative works should not in any way suggest that we endorse you or your use of this work.
**ShareAlike** - If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
>>>>>>> 0bcf4ebed9127d135c9d6c2af27ce36f6044697f

View File

@ -62,7 +62,6 @@
"05-30",
"05-32",
"00-title",
"01-01",
"01-03",
"01-06",
"01-09",