From dbd7a02ab03dcc97a6d0eb0c6fcc95a75a63cc6d Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Mon, 15 Jul 2013 22:07:29 +0200
Subject: Using CaptchaService to make them works on 0.5 (cherry picked from
 commit dd30ed8ae9f9ba1472d1ff9721d626dcc39b12fd)

Conflicts:
	pyload/plugins/hoster/EgoFilesCom.py
	pyload/plugins/hoster/FreakshareCom.py
	pyload/plugins/hoster/LuckyShareNet.py
	pyload/plugins/hoster/UploadedTo.py
---
 pyload/plugins/hoster/UploadedTo.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'pyload/plugins/hoster/UploadedTo.py')

diff --git a/pyload/plugins/hoster/UploadedTo.py b/pyload/plugins/hoster/UploadedTo.py
index 5aa08891e..8285ef474 100644
--- a/pyload/plugins/hoster/UploadedTo.py
+++ b/pyload/plugins/hoster/UploadedTo.py
@@ -11,7 +11,12 @@ 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')
 
-- 
cgit v1.2.3