fixed conflict

2015-01-12 21:16:03 -06:00
parent 57c5fb64f6 e9de0766bc
commit 181546e49d
4 changed files with 530 additions and 8 deletions
@@ -430,7 +430,6 @@ class Table(object):
            if query:            
                self._common_filter = \
                    lambda q: reduce(AND, [query(q), newquery(q)])
-                newquery = query & newquery
            else:
                self._common_filter = newquery