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 /testing/tests/ikev2/two-certs/hosts/carol/etc/ipsec.conf | |
| 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 'testing/tests/ikev2/two-certs/hosts/carol/etc/ipsec.conf')
| -rwxr-xr-x | testing/tests/ikev2/two-certs/hosts/carol/etc/ipsec.conf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/testing/tests/ikev2/two-certs/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/two-certs/hosts/carol/etc/ipsec.conf index 4eca932ec..08b95659f 100755 --- a/testing/tests/ikev2/two-certs/hosts/carol/etc/ipsec.conf +++ b/testing/tests/ikev2/two-certs/hosts/carol/etc/ipsec.conf @@ -2,10 +2,7 @@ config setup crlcheckinterval=180 -<<<<<<< HEAD -======= uniqueids=no ->>>>>>> upstream/4.5.1 strictcrlpolicy=yes plutostart=no |