From 4b0dc407f46a4a2330f756c422719fe5961373cf Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sun, 4 Dec 2011 15:08:00 -0500
Subject: treat order exclusively as a grouping

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