From fc0bc75ddc6aecef7486b83ce69fd3766835d2ee Mon Sep 17 00:00:00 2001
From: marco <marco.sottana@gmail.com>
Date: Wed, 26 Jun 2024 12:06:16 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20(manifest.json):=20fix=20conflic?=
 =?UTF-8?q?t=20in=20manifest.json=20file=20by=20removing=20unnecessary=20l?=
 =?UTF-8?q?ines=20and=20resolving=20merge=20conflict=20markers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/dist/manifest.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Resources/dist/manifest.json b/Resources/dist/manifest.json
index f80e1c19..284be460 100644
--- 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
   },