From ff3f6f2ce278dcb151593752c94690b6349c2736 Mon Sep 17 00:00:00 2001 From: Austin de Coup-Crank Date: Thu, 14 Mar 2019 08:03:49 -0700 Subject: [PATCH] Include extractors.py --- youtube_dl/extractor/extractors.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 7028ed05f..687994045 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -194,14 +194,10 @@ from .chirbit import ( ChirbitProfileIE, ) from .cinchcast import CinchcastIE -<<<<<<< HEAD from .ciscolive import ( CiscoLiveSessionIE, CiscoLiveSearchIE, ) -======= -from .ciscolive import CiscoLiveIE ->>>>>>> 2f72407593d15549a1ec6830a3cb5d7b4ad0b22b from .cjsw import CJSWIE from .cliphunter import CliphunterIE from .clippit import ClippitIE