aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/prosiebensat1.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-11-23 21:33:31 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-11-23 21:33:31 +0100
commit784b6d3a9bc79fe55a8b132fd10555c1e9a61c31 (patch)
treee9a7996c44fd8d07f0bef5cdebbafdbe9c0b7bb4 /youtube_dl/extractor/prosiebensat1.py
parentf3a34072266c0a7595f73fa032685cf8a50d2ab4 (diff)
parent2514d2635e0c8ff0fb72d00a093a849001df2bdd (diff)
Merge remote-tracking branch 'jtwaleson/master'
Diffstat (limited to 'youtube_dl/extractor/prosiebensat1.py')
-rw-r--r--youtube_dl/extractor/prosiebensat1.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py
index 619496de7..32d747ede 100644
--- a/youtube_dl/extractor/prosiebensat1.py
+++ b/youtube_dl/extractor/prosiebensat1.py
@@ -280,4 +280,4 @@ class ProSiebenSat1IE(InfoExtractor):
'upload_date': upload_date,
'duration': duration,
'formats': formats,
- } \ No newline at end of file
+ }