[Screenshot] fix merge conflict

japandotorg · Sep 23, 2024 · 49cd15e · 49cd15e
1 parent 35c8efc
commit 49cd15e
Showing 1 changed file with 0 additions and 7 deletions.
diff --git 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")