diff options
| author | Josh Kearney <josh@jk0.org> | 2011-07-27 16:39:27 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-07-27 16:39:27 -0500 |
| commit | a57115ef474440f21a500ce4f8970a9fcd99840e (patch) | |
| tree | e55bff66fe963e524cb28de88946b0b6bb4dc914 /nova/context.py | |
| parent | 0b4e10a48e2aaa816ce4ca4565068d1655ad53ef (diff) | |
| parent | ad00ca903b98fc33eca9f375b1e5dd146142839f (diff) | |
| download | nova-a57115ef474440f21a500ce4f8970a9fcd99840e.tar.gz nova-a57115ef474440f21a500ce4f8970a9fcd99840e.tar.xz nova-a57115ef474440f21a500ce4f8970a9fcd99840e.zip | |
Fixed conflict
Diffstat (limited to 'nova/context.py')
0 files changed, 0 insertions, 0 deletions