diff options
| author | Tom Christie | 2011-04-27 18:20:29 +0100 |
|---|---|---|
| committer | Tom Christie | 2011-04-27 18:20:29 +0100 |
| commit | da60f68f50dbcc177cb8b31df428d2daa905e9c6 (patch) | |
| tree | 6393597cdf4b6b0cc84f5ce792d3770d011aa189 /examples/pygments_api | |
| parent | 659898ffaf24f74b62e73c487cd81bad21904790 (diff) | |
| parent | b508ca38d44f458e3eabaa4ffd3500d80a71eb9e (diff) | |
| download | django-rest-framework-da60f68f50dbcc177cb8b31df428d2daa905e9c6.tar.bz2 | |
Merge previous checkins
Diffstat (limited to 'examples/pygments_api')
| -rw-r--r-- | examples/pygments_api/tests.py | 6 |
1 files changed, 6 insertions, 0 deletions
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):
|