From b38d8f8f757b0e5cfbc242bbedf1f07951e0a59c Mon Sep 17 00:00:00 2001
From: Eugene Evstafev <36392751+chigwell@users.noreply.github.com>
Date: Tue, 15 Apr 2025 11:16:38 +0100
Subject: [PATCH] fix: update .gitignore

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

diff --git a/.gitignore b/.gitignore
index 00ba4b4..1bcc19d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -176,8 +176,6 @@ cython_debug/
 # Telegram session files
 *.session
 *.session-journal
-<<<<<<< HEAD
-=======
 anon.session
 anon.session-journal
 anon_new.session