Fixed merge conflicts.

2016-03-14 11:36:41 -04:00
parent ada42c84de b888063f11
commit 557d2d457d
4 changed files with 12 additions and 15 deletions
@@ -1,6 +1,6 @@
-VERSION = (2, 0, 13)
-DEV_N = None
-
+VERSION = (2, 0, 14)
+DEV_N = None
+

 def get_version():
    version = '{0}.{1}'.format(VERSION[0], VERSION[1])
@@ -194,7 +194,7 @@ class SortableAdmin(SortableAdminBase, ModelAdmin):
            except (AttributeError, IndexError):
                # for Django 1.5.x
                order_field_name = opts.ordering[0]
-            finally:
+            except (AttributeError, IndexError):
                order_field_name = 'order'

            objects = objects.order_by(sortable_by_expression, order_field_name)