fixed conflict

This commit is contained in:
git_admin 2026-02-21 14:26:51 +03:00
parent 48d37c6f77
commit 17fc44d83e

4
.gitignore vendored
View File

@ -6,6 +6,10 @@ __pycache__/
# C extensions # C extensions
*.so *.so
<<<<<<< HEAD
=======
>>>>>>> a50fd0b ([0])
.DS_Store .DS_Store
# Distribution / packaging # Distribution / packaging
.Python .Python