Merge tag 'upstream/2014.12.01'

[youtubedl] / youtube_dl / extractor / vice.py

diff --git a/youtube_dl/extractor/vice.py b/youtube_dl/extractor/vice.py
index f11ca8217ff42e404e8a50faf40c18dfe8c5be5d..71f520fb525a5bef424061be1ff881408b762624 100644 (file)
--- a/youtube_dl/extractor/vice.py
+++ b/youtube_dl/extractor/vice.py
@@ -35,4 +35,3 @@ class ViceIE(InfoExtractor):
         except ExtractorError:
             raise ExtractorError('The page doesn\'t contain a video', expected=True)
         return self.url_result(ooyala_url, ie='Ooyala')
-