# Conflicts:
#	build.zip
#	client-dist/index.html
#	client-dist/resources/22.51a95842.js
#	client-dist/resources/app.25d19a81d265.css
#	client-dist/resources/manifest.88355f45.js
#	client-dist/resources/manifest.cc15f7f2.js
#	client-dist/resources/manifest.f76f1c2b.js
#	package.json