From 3e0ad1e69223f7272e9e762b5ca5639d9ecaebb4 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 6 Mar 2022 10:24:06 +0100
Subject: [PATCH] Fix

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

diff --git a/manifest.json b/manifest.json
index 99de862..a19e560 100644
--- a/manifest.json
+++ b/manifest.json
@@ -26,11 +26,7 @@
     "multi_instance": false,
     "services": [
         "nginx",
-<<<<<<< Updated upstream
         "php8.0-fpm",
-=======
-        "php7.4-fpm",
->>>>>>> Stashed changes
         "postgresql",
         "metronome"
     ],