diff options
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/__init__.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 4eae88d6c..7cf5de43f 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -71,12 +71,9 @@ __authors__ = ( 'Sebastian Haas', 'Alexander Kirk', 'Erik Johnson', -<<<<<<< HEAD 'Keith Beckman', 'Ole Ernst', -======= 'Aaron McDaniel (mcd1992)', ->>>>>>> Implemented --exec option. ) __license__ = 'Public Domain' |