From cf6e03bf042483283c2a7a51fec29a6d73887965 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Fri, 26 Dec 2014 22:59:43 -0600
Subject: modify text

---
 pyramid/config/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.3