Fix conflict

[akkoma] / priv / static / packs / manifest.json

diff --git a/priv/static/packs/manifest.json b/priv/static/packs/manifest.json
index 9896bb660da1ccb7ebb3e4c9199dc0580dd2bf0e..5f8d36c2eb8e16515e42b088d341564587365e0e 100644 (file)
--- a/priv/static/packs/manifest.json
+++ b/priv/static/packs/manifest.json
@@ -11,12 +11,12 @@
   "application.js.map": "/packs/application.js.map",
   "base_polyfills.js": "/packs/base_polyfills.js",
   "base_polyfills.js.map": "/packs/base_polyfills.js.map",
-  "common.css": "/packs/common-daadaac9454e7d14470e7954e3143dca.css",
-  "common.css.map": "/packs/common-daadaac9454e7d14470e7954e3143dca.css.map",
+  "common.css": "/packs/common.css",
+  "common.css.map": "/packs/common.css.map",
   "common.js": "/packs/common.js",
   "common.js.map": "/packs/common.js.map",
-  "default.css": "/packs/default-6a12993217b6ce9bc8b514398a33b7c9.css",
-  "default.css.map": "/packs/default-6a12993217b6ce9bc8b514398a33b7c9.css.map",
+  "default.css": "/packs/default.css",
+  "default.css.map": "/packs/default.css.map",
   "default.js": "/packs/default.js",
   "default.js.map": "/packs/default.js.map",
   "elephant-fren.png": "/packs/elephant-fren-d16fd77f9a9387e7d146b5f9d4dc1e7f.png",
@@ -171,8 +171,8 @@
   "logo_full.svg": "/packs/logo_full-96e7a97fe469f75a23a74852b2478fa3.svg",
   "logo_transparent.png": "/packs/logo_transparent-6f79eeb2c38ec2d12ed4d978322457d6.png",
   "logo_transparent.svg": "/packs/logo_transparent-6900bab180aa3a46c34425e5367a218f.svg",
-  "mailer.css": "/packs/mailer-75783e1a7b802fd56ef054aa13585342.css",
-  "mailer.css.map": "/packs/mailer-75783e1a7b802fd56ef054aa13585342.css.map",
+  "mailer.css": "/packs/mailer.css",
+  "mailer.css.map": "/packs/mailer.css.map",
   "mailer.js": "/packs/mailer.js",
   "mailer.js.map": "/packs/mailer.js.map",
   "modals/onboarding_modal.js": "/packs/modals/onboarding_modal.js",