schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rebased with upstream/master

Browse source
This commit is contained in:
mcd1992 2014-08-24 15:04:50 -05:00
parent a2360a4c80
commit 7833d941bb
2 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
youtube_dl/__init__.py
View file

@ -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'