From f729fdc09d9939fd9671cd1c1a06d468cc20bb15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20N=C3=B6llemeyer?= <lukasln@gmx.de>
Date: Fri, 16 Aug 2024 17:50:00 +0200
Subject: [PATCH] s

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

diff --git a/.gitignore b/.gitignore
index 20f3383..3258b1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 .venv/
-<<<<<<< Updated upstream
 __pycache__/
-=======
 .direnv
 .envrc
 .python-version
->>>>>>> Stashed changes