From fcead1870013b6a970eca7878a66dbe783c80ea3 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 16 Feb 2015 03:40:45 +0100 Subject: Partially revert acc46fc3497a66a427b795b4a22c6e71d69185a1 --- pyload/plugin/addon/MergeFiles.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pyload/plugin/addon/MergeFiles.py') diff --git a/pyload/plugin/addon/MergeFiles.py b/pyload/plugin/addon/MergeFiles.py index 72dfd583d..18836f6ac 100644 --- a/pyload/plugin/addon/MergeFiles.py +++ b/pyload/plugin/addon/MergeFiles.py @@ -12,15 +12,15 @@ from pyload.utils import safe_join, fs_encode class MergeFiles(Addon): - __name = "MergeFiles" - __type = "addon" - __version = "0.13" + __name__ = "MergeFiles" + __type__ = "addon" + __version__ = "0.13" - __config = [("activated", "bool", "Activated", True)] + __config__ = [("activated", "bool", "Activated", True)] - __description = """Merges parts splitted with hjsplit""" - __license = "GPLv3" - __authors = [("and9000", "me@has-no-mail.com")] + __description__ = """Merges parts splitted with hjsplit""" + __license__ = "GPLv3" + __authors__ = [("and9000", "me@has-no-mail.com")] BUFFER_SIZE = 4096 -- cgit v1.2.3