🔧 (manifest.json): fix conflict in manifest.json file by removing unn…

…ecessary lines and resolving merge conflict markers
laraxot · Jun 26, 2024 · fc0bc75 · fc0bc75
1 parent f6aae9d
commit fc0bc75
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Resources/dist/manifest.json b/Resources/dist/manifest.json
@@ -1,10 +1,6 @@
 {
   "Resources/css/app.css": {
-<<<<<<< HEAD
-    "file": "assets/app-D4rFEOff.css",
-=======
     "file": "assets/app-Dh0FPYev.css",
->>>>>>> 9ac884e (up)
     "src": "Resources/css/app.css",
     "isEntry": true
   },