# Conflicts: # css/style.css # index.html # js/language.js # lang/main-en.json # spells.html |
||
---|---|---|
.. | ||
books-en.json | ||
books-fr.json | ||
main-en.json | ||
main-fr.json |
# Conflicts: # css/style.css # index.html # js/language.js # lang/main-en.json # spells.html |
||
---|---|---|
.. | ||
books-en.json | ||
books-fr.json | ||
main-en.json | ||
main-fr.json |