Merge tag 'upstream/2014.12.01'

[youtubedl] / youtube_dl / extractor / ntv.py

diff --git a/youtube_dl/extractor/ntv.py b/youtube_dl/extractor/ntv.py
index ed60314eca4f918392da7fe2637e47ed3cdf5ee9..13c8d79cd8ac6346dbe4e9810bc8bf0b20825dcc 100644 (file)
--- a/youtube_dl/extractor/ntv.py
+++ b/youtube_dl/extractor/ntv.py
@@ -145,4 +145,4 @@ class NTVIE(InfoExtractor):
             'duration': duration,
             'view_count': view_count,
             'formats': formats,
-        }
\ No newline at end of file
+        }