summaryrefslogtreecommitdiff
path: root/docs/narr/advconfig.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/narr/advconfig.rst')
-rw-r--r--docs/narr/advconfig.rst7
1 files changed, 2 insertions, 5 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index 8040a465f..7b62b1a73 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -82,11 +82,8 @@ that ends something like this:
self.commit()
File "pyramid/pyramid/config.py", line 473, in commit
self._ctx.execute_actions()
- File "zope/configuration/config.py", line 600, in execute_actions
- for action in resolveConflicts(self.actions):
- File "zope/configuration/config.py", line 1507, in resolveConflicts
- raise ConfigurationConflictError(conflicts)
- zope.configuration.config.ConfigurationConflictError:
+ ... more code ...
+ pyramid.exceptions.ConfigurationConflictError:
Conflicting configuration actions
For: ('view', None, '', None, <InterfaceClass pyramid.interfaces.IView>,
None, None, None, None, None, False, None, None, None)