Urg. Fixing broken merge

1 files changed, 0 insertions, 6 deletions

diff --git a/examples/blogpost/tests.py b/examples/blogpost/tests.py
index 494478d8..9b9a682f 100644
--- a/examples/blogpost/tests.py
+++ b/examples/blogpost/tests.py
@@ -3,10 +3,7 @@
 
 from django.core.urlresolvers import reverse
 from django.test import TestCase
-<<<<<<< local
-=======
 from django.core.urlresolvers import reverse
->>>>>>> other
 from django.utils import simplejson as json
 
 from djangorestframework.compat import RequestFactory
@@ -170,10 +167,7 @@ class AllowedMethodsTests(TestCase):
 
 
 #above testcases need to probably moved to the core
-<<<<<<< local
-=======
 
->>>>>>> other
 
 class TestRotation(TestCase):
     """For the example the maximum amount of Blogposts is capped off at views.MAX_POSTS.