diff options
Diffstat (limited to 'src/pki/command.h')
| -rw-r--r-- | src/pki/command.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/pki/command.h b/src/pki/command.h index fad598c0b..70a26f712 100644 --- a/src/pki/command.h +++ b/src/pki/command.h @@ -29,7 +29,11 @@ /** * Maximum number of options in a command (+1) */ +<<<<<<< HEAD #define MAX_OPTIONS 20 +======= +#define MAX_OPTIONS 32 +>>>>>>> upstream/4.5.1 /** * Maximum number of usage summary lines (+1) |