diff options
| author | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-01-14 08:55:56 +0900 |
|---|---|---|
| committer | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-01-14 08:55:56 +0900 |
| commit | fa5024b384953d30e91117a0c2874560e086aa58 (patch) | |
| tree | a540c11e9cdb154027b542ff1cda365d376974e6 | |
| parent | c57ccba743c54786e28317194000bcf22dc5b69e (diff) | |
| download | nova-fa5024b384953d30e91117a0c2874560e086aa58.tar.gz nova-fa5024b384953d30e91117a0c2874560e086aa58.tar.xz nova-fa5024b384953d30e91117a0c2874560e086aa58.zip | |
remove ">>>MERGE" iin nova/db/sqlalchemy/api.py
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index b38a08a83..4ea85a094 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -2117,4 +2117,3 @@ def console_get(context, console_id, instance_id=None): {'instance': idesc, 'console_id': console_id}) return result ->>>>>>> MERGE-SOURCE |