diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-28 16:54:57 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-28 16:54:57 -0700 |
| commit | bd5816698316f64a2df700ed361b66e533eb9a31 (patch) | |
| tree | 6a5b111ae15e2b9d7ca607864803bc2b6b1cfc8f /nova/flags.py | |
| parent | 669cf475d11700064aa16f959077d0512e6b1531 (diff) | |
| parent | 2b65cf963b8afbc4703f79d3057e5c19f2894baa (diff) | |
| download | nova-bd5816698316f64a2df700ed361b66e533eb9a31.tar.gz nova-bd5816698316f64a2df700ed361b66e533eb9a31.tar.xz nova-bd5816698316f64a2df700ed361b66e533eb9a31.zip | |
fixed merge conflicts
Diffstat (limited to 'nova/flags.py')
0 files changed, 0 insertions, 0 deletions