diff options
| author | Ricardo Carrillo Cruz <emaildericky@gmail.com> | 2011-01-25 15:33:19 +0100 |
|---|---|---|
| committer | Ricardo Carrillo Cruz <emaildericky@gmail.com> | 2011-01-25 15:33:19 +0100 |
| commit | 3ad22216eee67abfabb28efe2561f0fdcf10e6e1 (patch) | |
| tree | f4288525d1ec55edfcd48dbb83cb913af95a001b /nova/version.py | |
| parent | 34d1022e8fbcfe2b6aaf30c6916ad01f0fe1769c (diff) | |
| parent | 07f39806f3b82d5d06371758e3efe597a47434ed (diff) | |
| download | nova-3ad22216eee67abfabb28efe2561f0fdcf10e6e1.tar.gz nova-3ad22216eee67abfabb28efe2561f0fdcf10e6e1.tar.xz nova-3ad22216eee67abfabb28efe2561f0fdcf10e6e1.zip | |
Fixed merge conflict
Diffstat (limited to 'nova/version.py')
0 files changed, 0 insertions, 0 deletions