diff options
| author | Tom Christie | 2011-04-27 18:44:21 +0100 |
|---|---|---|
| committer | Tom Christie | 2011-04-27 18:44:21 +0100 |
| commit | 5a59f339c1757767b136de33faa5b67a972141a1 (patch) | |
| tree | 56af543c3312875e8e945248293ebc263d833b44 /examples | |
| parent | b18302586c0eeea2e09c799544b9c0a855e11755 (diff) | |
| download | django-rest-framework-5a59f339c1757767b136de33faa5b67a972141a1.tar.bz2 | |
Urg. Fixing broken merge
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/blogpost/tests.py | 6 | ||||
| -rw-r--r-- | examples/pygments_api/tests.py | 6 |
2 files changed, 0 insertions, 12 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. diff --git a/examples/pygments_api/tests.py b/examples/pygments_api/tests.py index 766defc3..6eb69da5 100644 --- a/examples/pygments_api/tests.py +++ b/examples/pygments_api/tests.py @@ -1,18 +1,12 @@ 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):
|