diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/blogpost/tests.py | 8 | ||||
| -rw-r--r-- | examples/pygments_api/tests.py | 6 |
2 files changed, 14 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. diff --git a/examples/pygments_api/tests.py b/examples/pygments_api/tests.py index a8f085cf..262f02b3 100644 --- a/examples/pygments_api/tests.py +++ b/examples/pygments_api/tests.py @@ -1,12 +1,18 @@ from django.test import TestCase
from django.utils import simplejson as json
+<<<<<<< local
+=======
+>>>>>>> other
from djangorestframework.compat import RequestFactory
from pygments_api import views
import tempfile, shutil
+<<<<<<< local
+=======
+>>>>>>> other
class TestPygmentsExample(TestCase):
|