[youku] adapt my modification to main repo

2015-12-17 10:25:32 +08:00 · 2015-12-17 10:25:32 +08:00 · 1d189d15c5
commit 1d189d15c5
parent 2c9089dab7
1 changed files with 0 additions and 4 deletions
--- a/youtube_dl/extractor/youku.py
+++ b/youtube_dl/extractor/youku.py
@ -87,10 +87,6 @@ class YoukuIE(InfoExtractor):
        # get oip
        oip = data['security']['ip']

-<<<<<<< HEAD
-=======
-        # get fileid
->>>>>>> githubMaster/youku_bugfix
        fileid_dict = {}
        for stream in data['stream']:
            format = stream.get('stream_type')