Resolved conflicts

bagisto · May 14, 2024 · 9bdc6e8 · 9bdc6e8
1 parent 3665d68
commit 9bdc6e8
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 74 deletions.
diff --git a/public/themes/admin/default/build/assets/app-25c0197d.js b/public/themes/admin/default/build/assets/app-25c0197d.js
diff --git a/public/themes/admin/default/build/assets/app-2766b45c.css b/public/themes/admin/default/build/assets/app-2766b45c.css
diff --git a/public/themes/admin/default/build/assets/app-44f73824.css b/public/themes/admin/default/build/assets/app-44f73824.css
diff --git a/public/themes/admin/default/build/assets/app-878daf20.js b/public/themes/admin/default/build/assets/app-878daf20.js
diff --git a/...min/default/build/assets/app-a475c0fa.css → ...min/default/build/assets/app-911536a8.css b/...min/default/build/assets/app-a475c0fa.css → ...min/default/build/assets/app-911536a8.css
diff --git a/public/themes/admin/default/build/assets/app-d119ac0a.css b/public/themes/admin/default/build/assets/app-d119ac0a.css
diff --git a/public/themes/admin/default/build/manifest.json b/public/themes/admin/default/build/manifest.json
@@ -1,6 +1,6 @@
 {
   "src/Resources/assets/css/app.css": {
-    "file": "assets/app-2766b45c.css",
+    "file": "assets/app-911536a8.css",
     "isEntry": true,
     "src": "src/Resources/assets/css/app.css"
   },
@@ -172,7 +172,7 @@
     "css": [
       "assets/app-c04ede37.css"
     ],
-    "file": "assets/app-25c0197d.js",
+    "file": "assets/app-878daf20.js",
     "isEntry": true,
     "src": "src/Resources/assets/js/app.js"
   },