From 1b6fd9e52310201eb8e637d3deb225da64dfc371 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 7 Dec 2010 22:10:32 -0500 Subject: remove stray import --- pyramid/tests/test_configuration.py | 1 - 1 file changed, 1 deletion(-) 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 -- cgit v1.2.3