# Conflicts:
#	dist/index.html
#	dist/static/css/public.css
#	index.html

# Conflicts:
#	dist/index.html
#	dist/static/css/app.2d7d14a601ce26fdc1e7b84a3135ca40.css
#	dist/static/js/manifest.6abeb188d0150b984c1f.js
#	dist/static/js/manifest.8365f9d74cb734000d9d.js
#	dist/static/js/manifest.e5ddf3b87a95286e3eeb.js

# Conflicts:
#	dist/index.html
#	dist/static/css/app.2d7d14a601ce26fdc1e7b84a3135ca40.css

# Conflicts:
#	dist/index.html
#	dist/static/css/app.31919e20448841e1122c1752f7d50201.css
#	dist/static/css/app.bb0618f0f312f474f7be36d0a4692e3e.css
#	dist/static/css/app.efa46cd45a87eb89b190b09e23d2a13f.css
#	dist/static/js/manifest.96dbdf9a756f0d1bffea.js