# Conflicts: # public/admin/index.html # public/admin/static/css/chunk-38f3bd54.7b3cf34b.css # public/admin/static/css/chunk-40d83ff5.8de2767d.css # public/admin/static/css/chunk-ba5d7c16.1ff6bb39.css # public/admin/static/js/app.309612dd.js # public/admin/static/js/app.d0c688de.js # public/admin/static/js/app.ec9c3f35.js