From 1d189d15c51c0a51e7e74c4babe06575f3f475e2 Mon Sep 17 00:00:00 2001
From: Celthi <txtlu0@gmail.com>
Date: Thu, 17 Dec 2015 10:25:32 +0800
Subject: [PATCH] [youku] adapt my modification to main repo

---
 youtube_dl/extractor/youku.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/youtube_dl/extractor/youku.py b/youtube_dl/extractor/youku.py
index 24e3953bd..30cd80611 100644
--- 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')