# Conflicts:
#	public/app/dist/index.html
#	public/app/dist/static/css/app.6392f84953d939ace29086975aa83cdd.css
#	public/app/dist/static/css/app.6415fcecd7cbf40ec4daa592679ac155.css
#	public/app/dist/static/css/app.fd6bd823e9398df810bfb6c6a25ff619.css
#	public/app/dist/static/js/app.d23fc331d3a208a697e3.js
#	public/resource/js/login.js