From dafe77ef81fcfcc8b96fe93b616ba430c3f21f1c Mon Sep 17 00:00:00 2001
From: Mateusz779 <mateusz.kedziora@mkedziora.pl>
Date: Fri, 7 Apr 2023 08:59:29 +0200
Subject: [PATCH] -

---
 .gitignore | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3aa1a9..ea4e702 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 /__pycache__
 /venv
 /configs/squash
-=======
-/venv
-/__pycache__
->>>>>>> 7ca4d57 (-)
+