From 7833d941bb736a8dbd237f1c7bc268d671cabb68 Mon Sep 17 00:00:00 2001
From: mcd1992 <theanonbutinf@gmail.com>
Date: Sun, 24 Aug 2014 15:04:50 -0500
Subject: [PATCH] Rebased with upstream/master

---
 README.md              | 2 --
 youtube_dl/__init__.py | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/README.md b/README.md
index 30bdac1899..ba9fec8a7b 100644
--- a/README.md
+++ b/README.md
@@ -288,8 +288,6 @@ ## Post-processing Options:
                                      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 4eae88d6c3..7cf5de43f0 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -71,12 +71,9 @@
     'Sebastian Haas',
     'Alexander Kirk',
     'Erik Johnson',
-<<<<<<< HEAD
     'Keith Beckman',
     'Ole Ernst',
-=======
     'Aaron McDaniel (mcd1992)',
->>>>>>> Implemented --exec option.
 )
 
 __license__ = 'Public Domain'