diff options
| author | Jason Cannavale <jason.cannavale@rackspace.com> | 2011-05-31 11:51:24 -0500 |
|---|---|---|
| committer | Jason Cannavale <jason.cannavale@rackspace.com> | 2011-05-31 11:51:24 -0500 |
| commit | 14b6bb455e94e150925677a17c5ccbcf86696dee (patch) | |
| tree | b41c9d728f8a85d8a326158ccb4209d6ee52c09f /bin/stack | |
| parent | e16ac0dbe6d1ca73ef6bb8f906c2dfdf2269ab6d (diff) | |
| parent | f903911a078f4356b91cb7d0965456612b26698c (diff) | |
| download | nova-14b6bb455e94e150925677a17c5ccbcf86696dee.tar.gz nova-14b6bb455e94e150925677a17c5ccbcf86696dee.tar.xz nova-14b6bb455e94e150925677a17c5ccbcf86696dee.zip | |
Cleaned up text conflict.
Diffstat (limited to 'bin/stack')
| -rwxr-xr-x | bin/stack | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -65,7 +65,7 @@ def format_help(d): indent = MAX_INDENT - 6 out = [] - for k, v in d.iteritems(): + for k, v in sorted(d.iteritems()): if (len(k) + 6) > MAX_INDENT: out.extend([' %s' % k]) initial_indent = ' ' * (indent + 6) |