diff options
| author |  mkaay <mkaay@mkaay.de>
| 2011-12-13 13:18:26 +0100 |
|---|---|---|
| committer | mkaay <mkaay@mkaay.de>
| 2011-12-13 13:18:26 +0100 |
| commit | 7754a63f107dcbec32b60be7aa68fdfbc6fcba19 (patch) | |
| tree | e1b01d13562ab68f8af561e8a5a51a1a8ec2df98 /module | |
| parent | Fix megaupload account info (diff) | |
| download | pyload-7754a63f107dcbec32b60be7aa68fdfbc6fcba19.tar.xz | |
closed #457
Diffstat (limited to 'module')
| -rw-r--r-- | module/database/FileDatabase.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/module/database/FileDatabase.py b/module/database/FileDatabase.py index d0eff0d98..d4514c710 100644 --- a/module/database/FileDatabase.py +++ b/module/database/FileDatabase.py @@ -176,11 +176,7 @@ class FileHandler: packs = self.packageCache.values() for pack in packs: -<<<<<<< mine if pack.queue == queue and pack.order > oldorder: -======= - if pack.queue == p.queue and p.order < oldorder: ->>>>>>> theirs pack.order -= 1 pack.notifyChange() |