From 96a8092716b0fd1cddddd523c5ed4cdb3d6a309e Mon Sep 17 00:00:00 2001
From: Hamed <36635653+Hamedrz004@users.noreply.github.com>
Date: Thu, 4 Dec 2025 17:02:09 +0330
Subject: [PATCH] Remove merge conflict markers from requirements.txt

---
 requirements.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a27ea75..27542e7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,4 @@
 keyboard==0.13.5
 pyperclip==1.9.0
 pystray==0.19.5
-<<<<<<< HEAD
 Pillow==12.0.0
-=======
-Pillow==12.0.0
->>>>>>> 4143eb7dfbdcc5a646f23c1fc5369779d41c4f4a