summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/context.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2020-07-08 15:12:30 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2020-07-08 15:44:39 -0400
commit54b0cebc2b22475e4ae153d7e84ecb953797f4c5 (patch)
treeef19c5c9087ca9564455b27e4448d447cc8d8b14 /lib/sqlalchemy/orm/context.py
parenta438952d60d50748c22c51fd64317f523b735865 (diff)
downloadsqlalchemy-54b0cebc2b22475e4ae153d7e84ecb953797f4c5.tar.gz
Repair change of "future_select" caught in merge conflict
the recent change to select() apparently seems to have been merged with other statements in the test_update_delete test that was still using the old term. Change-Id: I6be3eb148249bfcf08aae19efcad89803c69c658
Diffstat (limited to 'lib/sqlalchemy/orm/context.py')
0 files changed, 0 insertions, 0 deletions