summaryrefslogtreecommitdiff
path: root/src/pki/command.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pki/command.c')
-rw-r--r--src/pki/command.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/pki/command.c b/src/pki/command.c
index b9c35d99b..245b22af3 100644
--- a/src/pki/command.c
+++ b/src/pki/command.c
@@ -201,7 +201,11 @@ 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);
}