From 17fc44d83e7f07575d81b24f3f34886fc1a74769 Mon Sep 17 00:00:00 2001
From: git_admin <nsmorozov.rf@yandex.ru>
Date: Sat, 21 Feb 2026 14:26:51 +0300
Subject: [PATCH] fixed conflict

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

diff --git a/.gitignore b/.gitignore
index 396e038..f3627a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,10 @@ __pycache__/
 
 # C extensions
 *.so
+<<<<<<< HEAD
+=======
+
+>>>>>>> a50fd0b ([0])
 .DS_Store
 # Distribution / packaging
 .Python