diff options
Diffstat (limited to 'examples/pygments_api/tests.py')
| -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):
|