summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pyramid/tests/test_configuration.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/pyramid/tests/test_configuration.py b/pyramid/tests/test_configuration.py
index 3edddb8e9..aae0faffe 100644
--- a/pyramid/tests/test_configuration.py
+++ b/pyramid/tests/test_configuration.py
@@ -3468,7 +3468,6 @@ class ConfiguratorTests(unittest.TestCase):
self.assertRaises(ConfigurationConflictError, config.commit)
def test_commit_conflict_resolved_with_two_includes_and_local(self):
- from zope.configuration.config import ConfigurationConflictError
config = self._makeOne()
def view1(request): pass
def view2(request): pass