From 34e5d622454ea17724d3bc27c2a91229cebe4a89 Mon Sep 17 00:00:00 2001
From: Brandon Taylor <brandon@iambrandontaylor.com>
Date: Mon, 22 Dec 2014 10:30:56 -0500
Subject: [PATCH] Fixed merge conflict.

---
 sample_project/app/models.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sample_project/app/models.py b/sample_project/app/models.py
index 7fcc520..bf8b563 100644
--- 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