From 7833d941bb736a8dbd237f1c7bc268d671cabb68 Mon Sep 17 00:00:00 2001 From: mcd1992 Date: Sun, 24 Aug 2014 15:04:50 -0500 Subject: Rebased with upstream/master --- youtube_dl/__init__.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'youtube_dl') diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 4eae88d6c..7cf5de43f 100644 --- 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' -- cgit v1.2.3