From 7754a63f107dcbec32b60be7aa68fdfbc6fcba19 Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Tue, 13 Dec 2011 13:18:26 +0100
Subject: closed #457

---
 module/database/FileDatabase.py | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'module')

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()
 
-- 
cgit v1.2.3