From 35d012233831a7c34d11be5642df31ba9c9b966d Mon Sep 17 00:00:00 2001
From: zuoht <zuoht@rising.com.cn>
Date: Tue, 16 Apr 2013 17:13:04 +0800
Subject: [PATCH] fix auto merge

---
 src/you_get/__main__.py            | 1 -
 src/you_get/downloader/__init__.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/you_get/__main__.py b/src/you_get/__main__.py
index eb7c6819..cd35a477 100644
--- a/src/you_get/__main__.py
+++ b/src/you_get/__main__.py
@@ -58,7 +58,6 @@ def url_to_module(url):
         'youku': youku,
         'youtu': youtube,
         'youtube': youtube,
-        'songtaste':songtaste,
         #TODO
     }
     if k in downloads:
diff --git a/src/you_get/downloader/__init__.py b/src/you_get/downloader/__init__.py
index 18663047..36b097b7 100644
--- a/src/you_get/downloader/__init__.py
+++ b/src/you_get/downloader/__init__.py
@@ -36,4 +36,3 @@ from .xiami import *
 from .yinyuetai import *
 from .youku import *
 from .youtube import *
-from .songtaste import *