Skip to content

Commit 5859063

Browse files
committed
woops
1 parent 92e50f5 commit 5859063

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

changedetectionio/content_fetchers/puppeteer.py

-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
from changedetectionio.content_fetchers.base import Fetcher, manage_user_agent
1010
from changedetectionio.content_fetchers.exceptions import PageUnloadable, Non200ErrorCodeReceived, EmptyReply, BrowserFetchTimedOut, BrowserConnectError
1111

12-
<<<<<<< HEAD
13-
14-
=======
15-
>>>>>>> db8f2d3b (Ability to set default UA for either fetching types)
1612
class fetcher(Fetcher):
1713
fetcher_description = "Puppeteer/direct {}/Javascript".format(
1814
os.getenv("PLAYWRIGHT_BROWSER_TYPE", 'chromium').capitalize()

0 commit comments

Comments
 (0)