diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-12-10 18:24:25 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-12-10 18:24:25 +0100 |
| commit | 10afb4ce9d155bdb05016b0661be3c4c3aa6b4f1 (patch) | |
| tree | 1590669c02be79d11a0a3b68bdce3d2cb29fe992 /pyload/plugins/addon/MergeFiles.py | |
| parent | Merge branch 'stable' into 0.4.10 (diff) | |
| download | pyload-10afb4ce9d155bdb05016b0661be3c4c3aa6b4f1.tar.xz | |
Fix previous merge
Diffstat (limited to 'pyload/plugins/addon/MergeFiles.py')
| -rw-r--r-- | pyload/plugins/addon/MergeFiles.py | 6 |
1 files changed, 0 insertions, 6 deletions
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 |