diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-07 15:51:28 -0600 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-07 15:51:28 -0600 |
| commit | 18b8d8307d0fc008f62dd8eeeedb351a954a3471 (patch) | |
| tree | a6438dd6316604ceb0aa563f98a606ee12cee032 | |
| parent | 253652adb578aee227b95dec3a5f854cac51bf4b (diff) | |
| download | nova-18b8d8307d0fc008f62dd8eeeedb351a954a3471.tar.gz nova-18b8d8307d0fc008f62dd8eeeedb351a954a3471.tar.xz nova-18b8d8307d0fc008f62dd8eeeedb351a954a3471.zip | |
removed a merge conflict line I missed before
| -rw-r--r-- | nova/compute/manager.py | 1 |
1 files changed, 0 insertions, 1 deletions
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 |