Rebased with upstream/master

diff --git a/README.md b/README.md
index 30bdac1899374e8cb906bafc8b4397e0cf41de4a..ba9fec8a7bd3bbc26b0dda1dead97498516f1435 100644 (file)
--- a/README.md
+++ b/README.md
@@ -288,8 +288,6 @@ which means you can modify it, redistribute it or use it however you like.
                                      postprocessors (default)
     --prefer-ffmpeg                  Prefer ffmpeg over avconv for running the
                                      postprocessors
-    --exec                           Execute a command after the file is finished downloading, similar to find's -exec format
-                                     Example: --exec 'adb push {} /sdcard/Music/ && rm {}'
 
 # CONFIGURATION
 

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'