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 /nova/api | |
| parent | 253652adb578aee227b95dec3a5f854cac51bf4b (diff) | |
removed a merge conflict line I missed before
Diffstat (limited to 'nova/api')
0 files changed, 0 insertions, 0 deletions