mirror of
https://github.com/ytdl-org/youtube-dl
synced 2025-10-02 06:18:37 +09:00
Rebased with upstream/master
This commit is contained in:
@@ -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'
|
||||
|
Reference in New Issue
Block a user