2 files changed, 0 insertions, 12 deletions
diff --git a/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/data.sql
index 0deb68188..ef6849c11 100644
--- a/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/net2net-cert/hosts/moon/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, 4, 5, 0
-=======
   name, ike_cfg, local_id, remote_id, mobike, dpd_delay
 ) VALUES (
   'net-net', 1, 4, 5, 0, 0
->>>>>>> upstream/4.5.1
 );
 
 INSERT INTO child_configs (
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 (