resovled conflicts.

krayin · Nov 7, 2024 · 3da4a19 · 3da4a19
1 parent f409787
commit 3da4a19
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/public/admin/build/assets/app-1b23879e.css b/public/admin/build/assets/app-1b23879e.css
diff --git a/public/admin/build/assets/app-62037ade.css b/public/admin/build/assets/app-62037ade.css
diff --git a/public/admin/build/assets/app-d6168e0d.css b/public/admin/build/assets/app-d6168e0d.css
diff --git a/public/admin/build/manifest.json b/public/admin/build/manifest.json
@@ -220,11 +220,7 @@
     "src": "node_modules/vue-cal/dist/i18n/zh-hk.es.js"
   },
   "src/Resources/assets/css/app.css": {
-<<<<<<< HEAD
-    "file": "assets/app-d6168e0d.css",
-=======
-    "file": "assets/app-1b23879e.css",
->>>>>>> 4848b68af8ce1b973fc60018860c8a8347d2b7bd
+    "file": "assets/app-62037ade.css",
     "isEntry": true,
     "src": "src/Resources/assets/css/app.css"
   },