From 0a76874e300b6beeb52bbaed97e8018a7cdb65c5 Mon Sep 17 00:00:00 2001
From: G4EVA-dev <tanzeglenn@gmail.com>
Date: Fri, 28 Feb 2025 22:57:29 +0100
Subject: [PATCH] fix: conflict in gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 236b4e6c..39f224c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -415,6 +415,9 @@ todo.txt
 docker-compose.yml
 data/
 
+# Docker compose
+docker-compose.yml
+data/
 
 data/
 docker-compose.yml