diff options
Diffstat (limited to 'module/database/FileDatabase.py')
| -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() |