diff options
| author | Charles Chen <chaochichen@gmail.com> | 2014-07-22 14:44:38 -0700 |
|---|---|---|
| committer | Charles Chen <chaochichen@gmail.com> | 2014-07-22 14:44:38 -0700 |
| commit | c4f731262dbee921147b94aac5035b5d9ec75502 (patch) | |
| tree | 98a93f1de2b7c71a8e25fa072515b4efc5f43ea1 /youtube_dl/extractor/firedrive.py | |
| parent | 07cc63f386c6afe253b7707631663072d2fb8789 (diff) | |
| parent | e42a692f003eabdb1efad7b9f4b10ce97c712d32 (diff) | |
Merge remote-tracking branch 'upstream/master' into MLB
Conflicts:
youtube_dl/extractor/mlb.py
Diffstat (limited to 'youtube_dl/extractor/firedrive.py')
| -rw-r--r-- | youtube_dl/extractor/firedrive.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/youtube_dl/extractor/firedrive.py b/youtube_dl/extractor/firedrive.py index d26145db1..6d73c8a4a 100644 --- a/youtube_dl/extractor/firedrive.py +++ b/youtube_dl/extractor/firedrive.py @@ -8,7 +8,6 @@ from ..utils import ( ExtractorError, compat_urllib_parse, compat_urllib_request, - determine_ext, ) |