From 34c544f696f9b3de2e7125fd22e77456ee70c0d6 Mon Sep 17 00:00:00 2001
From: Ahmed Darrazi <ahmeddarrazi@adsmac.local>
Date: Mon, 15 Dec 2025 15:40:32 +0100
Subject: [PATCH] fix: remove leftover merge marker from docker-compose.yml
 (valid YAML)

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

diff --git a/docker-compose.yml b/docker-compose.yml
index 621a9059..5e026a85 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
->>>>>>> origin/001-add-dokploy-deploy
 version: "3.8"
 
 services: