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

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

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