# Conflicts: # pages.json # routes/index.js # static/logo-plain.png # static/work/cardBack.png # static/work/cardFront.png # static/work/licenseBack.png # static/work/licenseFront.png
# Conflicts: # pages.json # routes/index.js # static/logo-plain.png # static/work/cardBack.png # static/work/cardFront.png # static/work/licenseBack.png # static/work/licenseFront.png