# Conflicts:
#	public/app/dist/index.html
#	public/app/dist/static/css/app.2731cbe41a9bdc40c86a1ebc324eaf25.css
#	public/app/dist/static/css/app.b3c8efcd73d8ef975473c87dd0aecfb5.css
#	public/app/dist/static/css/app.f88914f5793d687187a70815fc83a33a.css