From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 18 Aug 2013 19:36:26 +0000 (-0400)
Subject: fix the merge
X-Git-Tag: rel_0_8_3~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17274222f1bd3b844faea4d848756ae3ee3545dd;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix the merge
---

diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index 4da13b3fe0..b2f03450de 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: