diff options
| -rw-r--r-- | pyramid/config/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py index 5bc03c4cc..7252ed14e 100644 --- a/pyramid/config/__init__.py +++ b/pyramid/config/__init__.py @@ -211,7 +211,7 @@ class Configurator( :meth:`pyramid.config.Configurator.commit` is called. When :meth:`pyramid.config.Configurator.commit` is called, the actions implied by the called methods will be checked for configuration conflicts unless - ``autocommit`` is ``True``. If a conflict is detected a + ``autocommit`` is ``True``. If a conflict is detected, a ``ConfigurationConflictError`` will be raised. Calling :meth:`pyramid.config.Configurator.make_wsgi_app` always implies a final commit. |