summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 52a7024a2..67df733d9 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -1042,7 +1042,7 @@ def resolveConflicts(actions):
# executed before actions in a higher order. Within an order,
# actions are executed sequentially based on original action ordering
# ("i").
- order = action['order'] or i
+ order = action['order'] or 0
discriminator = action['discriminator']
# "ainfo" is a tuple of (order, i, action) where "order" is a