diff options
| author | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-19 13:41:58 +0200 |
|---|---|---|
| committer | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-19 13:41:58 +0200 |
| commit | b590992f735393c97489fce191e7810eaae4f6d7 (patch) | |
| tree | 286595c4aa43dbf3d616d816e5fade6ac364771a /src/pki/command.h | |
| parent | 2fce29055b7b5bc2860d503d1ae822931f80b7aa (diff) | |
| parent | 0a9d51a49042a68daa15b0c74a2b7f152f52606b (diff) | |
| download | vyos-strongswan-b590992f735393c97489fce191e7810eaae4f6d7.tar.gz vyos-strongswan-b590992f735393c97489fce191e7810eaae4f6d7.zip | |
Merge upstream version 4.5.2
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) |