summaryrefslogtreecommitdiffstats
path: root/bin/stack
diff options
context:
space:
mode:
authorKei Masumoto <masumotok@nttdata.co.jp>2011-01-14 08:55:56 +0900
committerKei Masumoto <masumotok@nttdata.co.jp>2011-01-14 08:55:56 +0900
commitfa5024b384953d30e91117a0c2874560e086aa58 (patch)
treea540c11e9cdb154027b542ff1cda365d376974e6 /bin/stack
parentc57ccba743c54786e28317194000bcf22dc5b69e (diff)
remove ">>>MERGE" iin nova/db/sqlalchemy/api.py
Diffstat (limited to 'bin/stack')
0 files changed, 0 insertions, 0 deletions