merge leftover corrected for proper pull request

2016-02-11 09:16:32 +01:00 · 2016-02-11 09:16:32 +01:00 · 04ff0c5771
commit 04ff0c5771
parent 9e1ec1ddb0
1 changed files with 0 additions and 4 deletions
--- a/youtube_dl/extractor/madmoizelle.py
+++ b/youtube_dl/extractor/madmoizelle.py
@ -2,13 +2,9 @@
 from __future__ import unicode_literals

 import re
-<<<<<<< HEAD
 from ..utils import (
    HEADRequest,
 )
-=======
-from ..utils import HEADRequest
->>>>>>> 7a50899fde5f12ad3f44bd92141a1161a139f0ee

 from .common import InfoExtractor