diff options
Diffstat (limited to 'djangorestframework/tests/reverse.py')
| -rw-r--r-- | djangorestframework/tests/reverse.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py index 63e2080a..49939d0e 100644 --- a/djangorestframework/tests/reverse.py +++ b/djangorestframework/tests/reverse.py @@ -5,10 +5,6 @@ from django.utils import simplejson as json from djangorestframework.resource import Resource -<<<<<<< local - -======= ->>>>>>> other class MockResource(Resource): """Mock resource which simply returns a URL, so that we can ensure that reversed URLs are fully qualified""" |