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/sql/net2net-cert/hosts/sun/etc | |
| 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/sql/net2net-cert/hosts/sun/etc')
| -rw-r--r-- | testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql index 245dd9694..79a35ef68 100644 --- a/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql +++ b/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql @@ -109,15 +109,9 @@ INSERT INTO ike_configs ( ); INSERT INTO peer_configs ( -<<<<<<< HEAD - name, ike_cfg, local_id, remote_id, mobike -) VALUES ( - 'net-net', 1, 5, 4, 0 -======= name, ike_cfg, local_id, remote_id, mobike, dpd_delay ) VALUES ( 'net-net', 1, 5, 4, 0, 0 ->>>>>>> upstream/4.5.1 ); INSERT INTO child_configs ( |