Fixed merge conflict.

2014-12-22 10:30:56 -05:00 · 2014-12-22 10:30:56 -05:00 · 34e5d62245
parent a3c1f4457a
commit 34e5d62245
1 changed files with 0 additions and 5 deletions
--- a/sample_project/app/models.py
+++ b/sample_project/app/models.py
@ -181,10 +181,5 @@ class SortableNonInlineCategory(SimpleModel, Sortable):
        verbose_name = 'Sortable Non-Inline Category'
        verbose_name_plural = 'Sortable Non-Inline Categories'

-<<<<<<< HEAD
-=======
-    non_sortable_category = SortableForeignKey(NonSortableCategory)
-
->>>>>>> e83e31cb22c681d4ddd954e993a9c2a129486ad4
    def __str__(self):
        return self.title