From 411c69b1f5eff7be56055c08a8440202a442814a Mon Sep 17 00:00:00 2001
From: Daggahh <odidihope@gmail.com>
Date: Fri, 28 Feb 2025 11:48:49 +0100
Subject: [PATCH] chore: resolve gitignore merge conflicts

- Merge duplicate entries
- Standardize data directory ignore
- Maintain all necessary ignore patterns
---
 .gitignore | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d291774d..4789117cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -386,7 +386,6 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-=======
 # Local
 dist
 /.env
@@ -401,11 +400,10 @@ dist
 *.dev
 *.prod
 
-
 # User specific ignores 
 todo.txt
 .vscode/
-data/db/
+data/
 docker-compose.yml
 package-lock.json
 .dev.env