fix the merge

diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index 4da13b3fe0d38aa2309afc9511e9952968456767..b2f03450decee556ab1b5d581f493b2a038e15bf 100644 (file)
--- 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: