Fixed merged conflict in __init__.py

Removed unused import in admin.py

adminsortable/__init__.py

@@ -1,8 +1,4 @@
-<<<<<<< Updated upstream
+VERSION = (2, 0, 10)
-VERSION = (2, 0, 8)  # following PEP 386
-=======
-VERSION = (2, 0, 10)  # following PEP 386
->>>>>>> Stashed changes
 DEV_N = None
 
 

adminsortable/admin.py

@@ -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