Briq
/
django-admin-sortable-fixwin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed merged conflict in __init__.py 

Removed unused import in admin.py
master
Brandon Taylor 2016-01-27 11:26:03 -05:00
parent 66c73a6bdc
commit 15d8f20178
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
adminsortable/__init__.py
View File

@ -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 DEV_N = None

2
adminsortable/admin.py
View File

@ -29,7 +29,7 @@ from django.template.defaultfilters import capfirst
from adminsortable.fields import SortableForeignKey from adminsortable.fields import SortableForeignKey
from adminsortable.models import SortableMixin 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 STATIC_URL = settings.STATIC_URL