From 17274222f1bd3b844faea4d848756ae3ee3545dd Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 18 Aug 2013 15:36:26 -0400
Subject: fix the merge

---
 lib/sqlalchemy/util/_collections.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index 4da13b3fe..b2f03450d 100644
--- a/lib/sqlalchemy/util/_collections.py
+++ b/lib/sqlalchemy/util/_collections.py
@@ -626,11 +626,7 @@ class WeakSequence(object):
         self._storage.remove(ref)
 
     def __iter__(self):
-<<<<<<< HEAD
-        return self._storage.itervalues()
-=======
         return (obj for obj in (ref() for ref in self._storage) if obj is not None)
->>>>>>> 676876f... Fixed a potential issue in an ordered sequence implementation used
 
     def __getitem__(self, index):
         try:
-- 
cgit v1.2.1