From 0e5223d740feabc94dfecafa010fa781266cbf0b Mon Sep 17 00:00:00 2001
From: bout3fiddy <11488427+bout3fiddy@users.noreply.github.com>
Date: Tue, 16 Apr 2024 11:14:38 +0200
Subject: [PATCH] merge conflict

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

diff --git a/.gitignore b/.gitignore
index 9339753..173eb82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,5 @@ venv/
 bvenv/
 .env
 .hypothesis/
-<<<<<<< HEAD
-=======
 .gz
 .json.gz
->>>>>>> main