projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Rebased with upstream/master
[youtube-dl]
/
youtube_dl
/
__init__.py
diff --git
a/youtube_dl/__init__.py
b/youtube_dl/__init__.py
index 4eae88d6c32c316b3bb3bf76471ba88e5553ed17..7cf5de43f0d9e41c341bd53e360eae69b028f12d 100644
(file)
--- 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'