summaryrefslogtreecommitdiff
path: root/tests/regressiontests
diff options
context:
space:
mode:
authorChris Beaven <smileychris@gmail.com>2011-04-25 05:59:09 +0000
committerChris Beaven <smileychris@gmail.com>2011-04-25 05:59:09 +0000
commitd8bfd3955d4fedbe45a7dcb7c2a533bf0e3a9ef7 (patch)
tree84297277d9488e291fc544ea22c4f31469de4a4f /tests/regressiontests
parenta6c08a53d37cd91f2073f8744539a4297fd652f3 (diff)
Fixes #15892 -- Duplicate 'settings' import (and some unused imports) in settings_tests. Thanks Shawn Milo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests')
-rw-r--r--tests/regressiontests/settings_tests/tests.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/regressiontests/settings_tests/tests.py b/tests/regressiontests/settings_tests/tests.py
index 5a4e8a7db2..12e1e2d9f6 100644
--- a/tests/regressiontests/settings_tests/tests.py
+++ b/tests/regressiontests/settings_tests/tests.py
@@ -1,6 +1,5 @@
from django.conf import settings
from django.utils import unittest
-from django.conf import settings, UserSettingsHolder, global_settings
class SettingsTests(unittest.TestCase):