diff options
Diffstat (limited to 'src/pki/command.c')
| -rw-r--r-- | src/pki/command.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/pki/command.c b/src/pki/command.c index 245b22af3..0142b4ab7 100644 --- a/src/pki/command.c +++ b/src/pki/command.c @@ -201,11 +201,7 @@ int command_usage(char *error) } for (i = 0; cmds[active].options[i].name; i++) { -<<<<<<< HEAD - fprintf(out, " --%-8s (-%c) %s\n", -======= fprintf(out, " --%-15s (-%c) %s\n", ->>>>>>> upstream/4.5.1 cmds[active].options[i].name, cmds[active].options[i].op, cmds[active].options[i].desc); } |