From 49cd15e880a544e0cd069fd4459968fe33f26b9d Mon Sep 17 00:00:00 2001
From: Lemon Rose <78662983+japandotorg@users.noreply.github.com>
Date: Mon, 23 Sep 2024 09:25:32 +0530
Subject: [PATCH] [Screenshot] fix merge conflict

---
 screenshot/core.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/screenshot/core.py b/screenshot/core.py
index dcd9ec5..7d3cde3 100644
--- a/screenshot/core.py
+++ b/screenshot/core.py
@@ -43,16 +43,9 @@
 from .common import FirefoxManager
 from .common.downloader import DriverManager
 from .common.exceptions import ProxyConnectFailedError
-<<<<<<< HEAD
 from .common.utils import counter as counter_api, URLConverter
 # isort: on
 
-=======
-from .common.filter import Filter
-from .common.utils import URLConverter
-from .common.utils import counter as counter_api
-from .common.utils import send_notification
->>>>>>> d11052e8a63960e403357be82630b4441c9fef87
 
 log: logging.Logger = logging.getLogger("red.seina.screenshot.core")