diff options
Diffstat (limited to 'src/pki/command.h')
| -rw-r--r-- | src/pki/command.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/pki/command.h b/src/pki/command.h index 70a26f712..a6f8bc758 100644 --- a/src/pki/command.h +++ b/src/pki/command.h @@ -29,11 +29,7 @@ /** * 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) |