Remove merge conflict markers from requirements.txt

2025-12-04 17:02:09 +03:30
parent ad7ca318a7
commit 96a8092716
1 changed files with 0 additions and 4 deletions
--- 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