From da5b10a2785a3888043509ee46260ae278cb5d38 Mon Sep 17 00:00:00 2001
From: Alex Bezdieniezhnykh <zxsanny@gmail.com>
Date: Thu, 22 May 2025 17:07:18 +0300
Subject: [PATCH] fix .gitignore

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

diff --git a/.gitignore b/.gitignore
index 5368cd9..4880441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,5 @@ models/
 *.mp4
 venv
 *.engine
-<<<<<<< HEAD
 *.log
-=======
 *.pyc
-
->>>>>>> 6146f2b (train fixes)