From 33c68b628dbfea51142a413ba098995b782bb254 Mon Sep 17 00:00:00 2001
From: HansGruber51 <122012968+HansGruber51@users.noreply.github.com>
Date: Sat, 30 Nov 2024 19:10:53 +0100
Subject: [PATCH] Update manifest.json

This Github file has an error at the end. So when I try to deploy with git on my plesk it doesn't even load the setup page.
Conflict problem on the call of the CSS file.
I made a very slight correction that now makes it work.
This is my first contribution on github (and in open source in general) so please be indulgent if it is not done in the rules. Thank you ;)

Signed-off-by: HansGruber51 <122012968+HansGruber51@users.noreply.github.com>
---
 public/build/manifest.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/build/manifest.json b/public/build/manifest.json
index 223c541166..9cf1f5f198 100644
--- a/public/build/manifest.json
+++ b/public/build/manifest.json
@@ -372,12 +372,8 @@
     "src": "resources/js/setup/setup.js"
   },
   "resources/sass/app.scss": {
-<<<<<<< HEAD
     "file": "assets/app-039bd735.css",
-=======
-    "file": "assets/app-9454bf28.css",
->>>>>>> v5-develop
     "isEntry": true,
     "src": "resources/sass/app.scss"
   }
-}
\ No newline at end of file
+}