diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-06-16 02:10:28 +0900 |
|---|---|---|
| committer | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-06-16 02:10:28 +0900 |
| commit | ab7c45a9be39def2d6cbb74084abc6fa42f593dd (patch) | |
| tree | 854f2cad7b6fd87c277242c062430436f7402d68 /nova/fakerabbit.py | |
| parent | a3b76218e03567312a84d3b3061d3472034166a4 (diff) | |
| download | nova-ab7c45a9be39def2d6cbb74084abc6fa42f593dd.tar.gz nova-ab7c45a9be39def2d6cbb74084abc6fa42f593dd.tar.xz nova-ab7c45a9be39def2d6cbb74084abc6fa42f593dd.zip | |
fix mismerge.
Diffstat (limited to 'nova/fakerabbit.py')
0 files changed, 0 insertions, 0 deletions