From f3fada9dd88ff00f81d16467a0599632ccf644e9 Mon Sep 17 00:00:00 2001
From: FrederikBaerentsen <frederik+gitea@baerentsen.net>
Date: Tue, 23 Sep 2025 17:58:15 +0200
Subject: [PATCH] Updated gitignore

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc9ffa9..42357d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,8 +26,6 @@ settings.local.json
 
 # Apple idiocy
 .DS_Store
-<<<<<<< HEAD
-=======
 
 # Documentation
 docusaurus/
@@ -35,4 +33,3 @@ vitepress/
 
 # Local data
 offline/
->>>>>>> b275742 (Updated gitignore)