diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-04-11 12:18:22 +0200 |
|---|---|---|
| committer |  Stefano <l.stickell@yahoo.it>
| 2014-04-21 17:20:41 +0200 |
| commit | 2069392beb3e8175c3bb7118535ef4475817d420 (patch) | |
| tree | eade5e6edec1d14a905863367b34c8f2e0cf0171 /pyload/plugins/addons/MergeFiles.py | |
| parent | Use wait to set time in SimpleHoster plugins (diff) | |
| download | pyload-2069392beb3e8175c3bb7118535ef4475817d420.tar.xz | |
Remove bad whitespaces
Merges vuolter/pyload@e4b2562
(cherry picked from commit d68938a9a7fbfb079b0a6de469de766b5892d769)
Conflicts:
module/plugins/Account.py
module/plugins/AccountManager.py
module/plugins/Container.py
module/plugins/Crypter.py
module/plugins/Hook.py
module/plugins/Hoster.py
module/plugins/Plugin.py
module/plugins/PluginManager.py
module/plugins/ReCaptcha.py
module/plugins/captcha/GigasizeCom.py
module/plugins/captcha/LinksaveIn.py
module/plugins/container/LinkList.py
pyload/plugins/internal/OCR.py
pyload/plugins/internal/ShareonlineBizOCR.py
Diffstat (limited to 'pyload/plugins/addons/MergeFiles.py')
| -rw-r--r-- | pyload/plugins/addons/MergeFiles.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyload/plugins/addons/MergeFiles.py b/pyload/plugins/addons/MergeFiles.py index 687017a4b..99b0aafc6 100644 --- a/pyload/plugins/addons/MergeFiles.py +++ b/pyload/plugins/addons/MergeFiles.py @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>. - + @author: and9000 """ |