From 8dbe6073781bb0e9425f17cd5e7ce7bf525f20c6 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 11 Apr 2014 11:50:52 +0200 Subject: Fix __author_name__ and __author_mail__ Merges vuolter/pyload@6c57a37 (cherry picked from commit ce955b6c04f6ddaab1696c6cabf5e0aa83cbf846) Conflicts: module/plugins/Account.py module/plugins/Container.py module/plugins/Crypter.py module/plugins/Hoster.py module/plugins/hooks/MultiDebridCom.py module/plugins/hooks/UnrestrictLi.py --- pyload/plugins/addons/MergeFiles.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pyload/plugins/addons/MergeFiles.py') diff --git a/pyload/plugins/addons/MergeFiles.py b/pyload/plugins/addons/MergeFiles.py index 869b5b6f8..e7f35d406 100644 --- a/pyload/plugins/addons/MergeFiles.py +++ b/pyload/plugins/addons/MergeFiles.py @@ -34,8 +34,8 @@ class MergeFiles(Hook): __description__ = "Merges parts splitted with hjsplit" __config__ = [("activated", "bool", "Activated", "False")] __threaded__ = ["packageFinished"] - __author_name__ = ("and9000") - __author_mail__ = ("me@has-no-mail.com") + __author_name__ = "and9000" + __author_mail__ = "me@has-no-mail.com" def setup(self): # nothing to do -- cgit v1.2.3