From 0b11e0cc92032dbe4707b3b9ddb3fa02ddfeb49f Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Wed, 20 Nov 2024 11:52:27 +0100
Subject: [PATCH] fix: gitignore merge conflict leftover

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b2aba0a863..a68af84071 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,5 +16,4 @@ dev/yasd_init.php
 .phpunit.result.cache
 Makefile
 appwrite.json
-<<<<<<< HEAD
 /.zed/