From a177706f45d5984764621598a8acccfa10697b04 Mon Sep 17 00:00:00 2001
From: LLL <117168736+LOUDO56@users.noreply.github.com>
Date: Sun, 21 Jan 2024 17:01:34 +0100
Subject: [PATCH] Update requirements.txt

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

diff --git a/requirements.txt b/requirements.txt
index f7b25e0..15f0ef4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,5 @@
 Pillow==10.2.0
 pynput==1.7.6
-<<<<<<< HEAD
 pystray==0.19.5
 Requests==2.31.0
-=======
-pystray==0.19.4
-Pillow==10.0.1
-requests==2.31.0
->>>>>>> ef32ce67988ec889cb2b5e1ee7ee49474bb00c97
 win10toast==0.9