Merge branch 'main' of https://github.com/japandotorg/Seina-Cogs

japandotorg · Sep 23, 2024 · 3debb28 · 3debb28
2 parents 26c45be + d11052e
commit 3debb28
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/screenshot/core.py b/screenshot/core.py
@@ -43,9 +43,16 @@
 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")