From a2f35e89275b808b4a5341d5f4aa2724d9106167 Mon Sep 17 00:00:00 2001
From: Manuel  Aranda Rosales <maranda@localhost>
Date: Wed, 20 Nov 2024 19:24:00 +0100
Subject: [PATCH] Update docker-compose-deploy.yml

Fix tipo
---
 docker-compose-deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml
index acf0ce8..121bcb4 100644
--- a/docker-compose-deploy.yml
+++ b/docker-compose-deploy.yml
@@ -41,7 +41,6 @@ services:
       - /opt/opengnsys/ogCore/etc/.env:/var/www/html/.env
       - /opt/opengnsys/ogCore/etc/env.json://var/www/html/env.json
 
->>>>>>> develop
     networks:
       - ogcore-network
     image: opengnsys/ogcore-php:static