Fixed merged conflict in __init__.py

Removed unused import in admin.py
2016-01-27 11:26:03 -05:00
parent 66c73a6bdc
commit 15d8f20178
2 changed files with 2 additions and 6 deletions
@@ -1,8 +1,4 @@
-<<<<<<< Updated upstream
-VERSION = (2, 0, 8)  # following PEP 386
-=======
-VERSION = (2, 0, 10)  # following PEP 386
->>>>>>> Stashed changes
+VERSION = (2, 0, 10)
 DEV_N = None


@@ -29,7 +29,7 @@ from django.template.defaultfilters import capfirst

 from adminsortable.fields import SortableForeignKey
 from adminsortable.models import SortableMixin
-from adminsortable.utils import get_is_sortable, check_model_is_sortable
+from adminsortable.utils import get_is_sortable

 STATIC_URL = settings.STATIC_URL