diff options
| author | Tom Christie | 2011-04-27 18:36:43 +0100 |
|---|---|---|
| committer | Tom Christie | 2011-04-27 18:36:43 +0100 |
| commit | b18302586c0eeea2e09c799544b9c0a855e11755 (patch) | |
| tree | 7aebd2f341f9e8f5b5c0e8bc23114afb05c2a1f6 /djangorestframework/tests/reverse.py | |
| parent | 1e1c4f85fc0d1a9ea0593b6906b6a09ec549c972 (diff) | |
| download | django-rest-framework-b18302586c0eeea2e09c799544b9c0a855e11755.tar.bz2 | |
Urg. Fix broken merging.
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""" |