summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-12-26 22:59:43 -0600
committerMichael Merickel <michael@merickel.org>2014-12-26 22:59:43 -0600
commitcf6e03bf042483283c2a7a51fec29a6d73887965 (patch)
tree73f55c340843b306a27876421486057cc8b1255c
parentd643c10413d49d5ec9c2bc0d6dc2dc4fb08c99c9 (diff)
downloadpyramid-cf6e03bf042483283c2a7a51fec29a6d73887965.tar.gz
pyramid-cf6e03bf042483283c2a7a51fec29a6d73887965.tar.bz2
pyramid-cf6e03bf042483283c2a7a51fec29a6d73887965.zip
modify text
-rw-r--r--pyramid/config/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 0bd61bc39..c35338826 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -1099,7 +1099,7 @@ class ActionState(object):
'During execution a re-entrant action was added '
'that modified the planned execution order in a '
'way that is incompatible with what has already '
- 'been done.')
+ 'been executed.')
else:
# resolved action is in the same location as before,
# so we are in good shape, but the action is already