From 97a4bdf286508c5616e2f6f363ac538d6cc8e279 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Wed, 3 Jul 2013 19:04:45 +0200
Subject: [PATCH] reverted changes to prevent merge conflicts

---
 openlp/core/lib/db.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py
index e7cee208d..c6bce2a00 100644
--- a/openlp/core/lib/db.py
+++ b/openlp/core/lib/db.py
@@ -105,8 +105,7 @@ def upgrade_db(url, upgrade):
     if version > upgrade.__version__:
         return version, upgrade.__version__
     version += 1
-    #FIXME: python3 - dislable upgrade
-    if load_changes and False:
+    if load_changes:
         while hasattr(upgrade, u'upgrade_%d' % version):
             log.debug(u'Running upgrade_%d', version)
             try: