summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/hoster/UploadedTo.py
diff options
context:
space:
mode:
authorGravatar Stefano <l.stickell@yahoo.it> 2013-07-15 22:27:46 +0200
committerGravatar Stefano <l.stickell@yahoo.it> 2013-07-15 22:27:46 +0200
commitf42190c92b3c507d6d0b65369dc4ce74fcbc676e (patch)
tree6c7fa2409f01067fb718c050118eb9f454bcc6ac /pyload/plugins/hoster/UploadedTo.py
parentUsing CaptchaService to make them works on 0.5 (diff)
downloadpyload-f42190c92b3c507d6d0b65369dc4ce74fcbc676e.tar.xz
Fixed broken plugins after dbd7a02ab03dcc97a6d0eb0c6fcc95a75a63cc6d
Diffstat (limited to 'pyload/plugins/hoster/UploadedTo.py')
-rw-r--r--pyload/plugins/hoster/UploadedTo.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/pyload/plugins/hoster/UploadedTo.py b/pyload/plugins/hoster/UploadedTo.py
index 8285ef474..4ae075cfa 100644
--- a/pyload/plugins/hoster/UploadedTo.py
+++ b/pyload/plugins/hoster/UploadedTo.py
@@ -11,12 +11,7 @@ from module.utils import html_unescape, parseFileSize, chunks
from module.plugins.Hoster import Hoster
from module.network.RequestFactory import getURL
-<<<<<<< HEAD:pyload/plugins/hoster/UploadedTo.py
-from module.plugins.ReCaptcha import ReCaptcha
-=======
-from module.plugins.Plugin import chunks
from module.plugins.internal.CaptchaService import ReCaptcha
->>>>>>> dd30ed8... Using CaptchaService to make them works on 0.5:module/plugins/hoster/UploadedTo.py
key = "bGhGMkllZXByd2VEZnU5Y2NXbHhYVlZ5cEE1bkEzRUw=".decode('base64')