From 24cd9ae11c26f196a5a08743b10d394f22c9163d Mon Sep 17 00:00:00 2001
From: Bleese B <bleese+homelab@proton.me>
Date: Sun, 12 Jul 2026 03:59:56 +0200
Subject: [PATCH] WIP

---
 docker-compose.dev.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 06bac2c..bf42237 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -32,14 +32,11 @@ services:
       - NODE_ENV=development
       - PUBLIC_ALLOWED_HOSTS=serviseri-004.captain.mitteworkspace.cloud
       - PUBLIC_HMR_HOST=serviseri-004.captain.mitteworkspace.cloud
-<<<<<<< HEAD
       - PUBLIC_HMR_PROTOCOL=ws
       - PUBLIC_HMR_CLIENT_PORT=4321
-=======
       - PUBLIC_HMR_PROTOCOL=wss
       - PUBLIC_HMR_CLIENT_PORT=443
       - PUBLIC_API_URL=https://api-004.captain.mitteworkspace.cloud/api/
->>>>>>> ea28748 (WIP: local production settings updates)
   
   flower:
     container_name: 004erpflower