From 6049cd30020ca03bb1193e95bc0fb860fc06e6f7 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 11 Apr 2014 12:16:14 +0200
Subject: Fix EOF Merges vuolter/pyload@00052b2

(cherry picked from commit 12485652a14c55e102e5d073f4bf9518f5cf5f85)

Conflicts:
	module/plugins/Container.py
	module/plugins/Crypter.py
	module/plugins/Hook.py
	module/plugins/PluginManager.py
	module/plugins/ReCaptcha.py
	pyload/plugins/accounts/MultishareCz.py
---
 pyload/plugins/crypter/CCF.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'pyload/plugins/crypter/CCF.py')

diff --git a/pyload/plugins/crypter/CCF.py b/pyload/plugins/crypter/CCF.py
index 2bd42480d..0badf8e06 100644
--- a/pyload/plugins/crypter/CCF.py
+++ b/pyload/plugins/crypter/CCF.py
@@ -39,4 +39,3 @@ class CCF(Crypter):
         tempdlc.close()
 
         self.packages.append((tempdlc_name, [tempdlc_name], tempdlc_name))
-
-- 
cgit v1.2.3