diff options
Diffstat (limited to 'examples/blogpost/tests.py')
| -rw-r--r-- | examples/blogpost/tests.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/examples/blogpost/tests.py b/examples/blogpost/tests.py index 14b0914d..494478d8 100644 --- a/examples/blogpost/tests.py +++ b/examples/blogpost/tests.py @@ -3,6 +3,10 @@ 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 @@ -166,6 +170,10 @@ 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. |