# Conflicts: # css/style.css # index.html # js/language.js # lang/main-en.json # spells.html |
||
---|---|---|
.. | ||
all.css | ||
all.min.css | ||
flickity.css | ||
style.css | ||
water.css |
# Conflicts: # css/style.css # index.html # js/language.js # lang/main-en.json # spells.html |
||
---|---|---|
.. | ||
all.css | ||
all.min.css | ||
flickity.css | ||
style.css | ||
water.css |