From cc71a014ab906fde7e9182bceb45a065c259cedc Mon Sep 17 00:00:00 2001
From: KeksNino <87879013+KeksNino@users.noreply.github.com>
Date: Sat, 14 Dec 2024 23:59:48 +0100
Subject: [PATCH] Update download.py

---
 download.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/download.py b/download.py
index 6c63af0..06de859 100644
--- a/download.py
+++ b/download.py
@@ -56,10 +56,5 @@ for download in downloads:
 
 keyboard.on_press_key("d", startDownload, suppress=False)
 keyboard.on_press_key("s", pauseDownload, suppress=False)
-<<<<<<< HEAD
 keyboard.on_press_key("q", pauseDownload, terminate)
 keyboard.wait("q")
-=======
-
-keyboard.wait("q")
->>>>>>> origin/main