From fa5024b384953d30e91117a0c2874560e086aa58 Mon Sep 17 00:00:00 2001
From: Kei Masumoto <masumotok@nttdata.co.jp>
Date: Fri, 14 Jan 2011 08:55:56 +0900
Subject: remove ">>>MERGE" iin nova/db/sqlalchemy/api.py

---
 nova/db/sqlalchemy/api.py | 1 -
 1 file changed, 1 deletion(-)

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
-- 
cgit