diff options
Diffstat (limited to 'testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql')
| -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 ( |