Solved conflict

This commit is contained in:
DeDiego, JesusJavier
2021-09-09 15:13:29 +02:00
25 changed files with 980 additions and 957 deletions

3
.gitignore vendored
View File

@@ -106,6 +106,5 @@ dist
# SSHFS
._*
_book/
**/.DS_Store
.DS_Store