diff options
| author | Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp> | 2011-01-26 19:44:13 +0900 |
|---|---|---|
| committer | Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp> | 2011-01-26 19:44:13 +0900 |
| commit | 2d97fa1fc2d2e98188e0ebab4e67d3d74ab7b146 (patch) | |
| tree | cb3384b393d5c87df86e68f8fe6eb535ca673b60 /nova/context.py | |
| parent | d139d81d3facb440f5f9b040d05e5b380ebf2c68 (diff) | |
| download | nova-2d97fa1fc2d2e98188e0ebab4e67d3d74ab7b146.tar.gz nova-2d97fa1fc2d2e98188e0ebab4e67d3d74ab7b146.tar.xz nova-2d97fa1fc2d2e98188e0ebab4e67d3d74ab7b146.zip | |
Fix merge miss
Diffstat (limited to 'nova/context.py')
0 files changed, 0 insertions, 0 deletions