diff options
Diffstat (limited to 'examples/pygments_api/tests.py')
| -rw-r--r-- | examples/pygments_api/tests.py | 6 |
1 files changed, 0 insertions, 6 deletions
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):
|