Fix bad merge

4 files changed, 2 insertions, 2 deletions

diff --git a/pyload/plugins/account/DebridItaliaCom.py b/pyload/plugins/account/DebridItaliaCom.py
index e0173fc8e..7252fc14b 100644
--- a/pyload/plugins/account/DebridItaliaCom.py
+++ b/pyload/plugins/account/DebridItaliaCom.py
@@ -22,14 +22,14 @@ class DebridItaliaCom(Account):
 
 
     def loadAccountInfo(self, user, req):
-        info = {"premium": False, "validuntil": None, "trafficleft": None}
+        info = {'premium': False, 'validuntil': None, 'trafficleft': None}
         html = req.load("http://debriditalia.com/")
 
         if 'Account premium not activated' not in html:
             m = re.search(self.WALID_UNTIL_PATTERN, html)
             if m:
                 validuntil = int(mktime(strptime(m.group(1), "%d/%m/%Y %H:%M")))
-                info = {"premium": True, "validuntil": validuntil, "trafficleft": -1}
+                info = {'premium': True, 'validuntil': validuntil, 'trafficleft': -1}
             else:
                 self.logError(_("Unable to retrieve account information"))
 
diff --git a/pyload/plugins/account/DevhostStFolder.py b/pyload/plugins/crypter/DevhostStFolder.py
index 942dc6b59..942dc6b59 100644
--- a/pyload/plugins/account/DevhostStFolder.py
+++ b/pyload/plugins/crypter/DevhostStFolder.py
diff --git a/pyload/plugins/account/DevhostSt.py b/pyload/plugins/hoster/DevhostSt.py
index 5be211809..5be211809 100644
--- a/pyload/plugins/account/DevhostSt.py
+++ b/pyload/plugins/hoster/DevhostSt.py
diff --git a/pyload/plugins/account/KingfilesNet.py b/pyload/plugins/hoster/KingfilesNet.py
index b8002741f..b8002741f 100644
--- a/pyload/plugins/account/KingfilesNet.py
+++ b/pyload/plugins/hoster/KingfilesNet.py