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

Fixed merge conflict.

master
Brandon Taylor 2014-12-22 10:30:56 -05:00
parent a3c1f4457a
commit 34e5d62245
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sample_project/app/models.py
View File

@ -181,10 +181,5 @@ class SortableNonInlineCategory(SimpleModel, Sortable):
verbose_name = 'Sortable Non-Inline Category' verbose_name = 'Sortable Non-Inline Category'
verbose_name_plural = 'Sortable Non-Inline Categories' verbose_name_plural = 'Sortable Non-Inline Categories'
<<<<<<< HEAD
=======
non_sortable_category = SortableForeignKey(NonSortableCategory)
>>>>>>> e83e31cb22c681d4ddd954e993a9c2a129486ad4
def __str__(self): def __str__(self):
return self.title return self.title