From 18b8d8307d0fc008f62dd8eeeedb351a954a3471 Mon Sep 17 00:00:00 2001
From: Ed Leafe <ed@leafe.com>
Date: Fri, 7 Jan 2011 15:51:28 -0600
Subject: removed a merge conflict line I missed before

---
 nova/compute/manager.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 8b5646a54..21b09e443 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -37,7 +37,6 @@ terminating it.
 import datetime
 import random
 import string
->>>>>>> MERGE-SOURCE
 import functools
 
 from nova import exception
-- 
cgit