diff options
| author | mcd1992 <theanonbutinf@gmail.com> | 2014-08-24 15:04:50 -0500 |
|---|---|---|
| committer | mcd1992 <theanonbutinf@gmail.com> | 2014-08-24 15:04:50 -0500 |
| commit | 7833d941bb736a8dbd237f1c7bc268d671cabb68 (patch) | |
| tree | e1e5953190f64754d7e1721c47948040f6018ff7 /youtube_dl | |
| parent | a2360a4c80700824f4160505fcdb1ca14261c031 (diff) | |
Rebased with upstream/master
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' |