summaryrefslogtreecommitdiff
path: root/testing/tests/ikev1/dynamic-responder/pretest.dat
diff options
context:
space:
mode:
Diffstat (limited to 'testing/tests/ikev1/dynamic-responder/pretest.dat')
-rw-r--r--testing/tests/ikev1/dynamic-responder/pretest.dat4
1 files changed, 0 insertions, 4 deletions
diff --git a/testing/tests/ikev1/dynamic-responder/pretest.dat b/testing/tests/ikev1/dynamic-responder/pretest.dat
index 983e0a47c..c0f166ff4 100644
--- a/testing/tests/ikev1/dynamic-responder/pretest.dat
+++ b/testing/tests/ikev1/dynamic-responder/pretest.dat
@@ -10,8 +10,4 @@ moon::sleep 1
carol::iptables -D INPUT -i eth0 -p udp --dport 500 --sport 500 -j ACCEPT
carol::iptables -D OUTPUT -o eth0 -p udp --dport 500 --sport 500 -j ACCEPT
dave::ipsec up moon
-<<<<<<< HEAD
-dave::sleep 1
-=======
dave::sleep 2
->>>>>>> upstream/4.5.1