mirror of
https://github.com/jazzband/django-admin-sortable.git
synced 2026-03-16 22:10:30 +00:00
Fixed bad merge.
This commit is contained in:
parent
f004d97bf1
commit
b888063f11
1 changed files with 1 additions and 5 deletions
|
|
@ -1,9 +1,5 @@
|
|||
<<<<<<< Updated upstream
|
||||
VERSION = (2, 0, 12)
|
||||
=======
|
||||
VERSION = (2, 0, 14)
|
||||
>>>>>>> Stashed changes
|
||||
DEV_N = None
|
||||
DEV_N = None
|
||||
|
||||
|
||||
def get_version():
|
||||
|
|
|
|||
Loading…
Reference in a new issue