From 10afb4ce9d155bdb05016b0661be3c4c3aa6b4f1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 10 Dec 2014 18:24:25 +0100
Subject: Fix previous merge

---
 pyload/plugins/addon/MergeFiles.py | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'pyload/plugins/addon/MergeFiles.py')

diff --git a/pyload/plugins/addon/MergeFiles.py b/pyload/plugins/addon/MergeFiles.py
index 2efc221dc..0c9b05283 100644
--- a/pyload/plugins/addon/MergeFiles.py
+++ b/pyload/plugins/addon/MergeFiles.py
@@ -26,13 +26,7 @@ class MergeFiles(Addon):
     BUFFER_SIZE = 4096
 
 
-    #@TODO: Remove in 0.4.10
-    def initPeriodical(self):
-        pass
-
-
     def setup(self):
-        # nothing to do
         pass
 
 
-- 
cgit v1.2.3