summaryrefslogtreecommitdiff
path: root/testing/tests/ikev1/xauth-rsa-fail/description.txt
diff options
context:
space:
mode:
Diffstat (limited to 'testing/tests/ikev1/xauth-rsa-fail/description.txt')
-rw-r--r--testing/tests/ikev1/xauth-rsa-fail/description.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/testing/tests/ikev1/xauth-rsa-fail/description.txt b/testing/tests/ikev1/xauth-rsa-fail/description.txt
index ed0fd3640..98d85f30b 100644
--- a/testing/tests/ikev1/xauth-rsa-fail/description.txt
+++ b/testing/tests/ikev1/xauth-rsa-fail/description.txt
@@ -2,8 +2,4 @@ The roadwarrior <b>carol</b> sets up a connection to gateway <b>moon</b>.
The authentication is based on RSA signatures (<b>RSASIG</b>) using X.509
certificates followed by extended authentication (<b>XAUTH</b>) based
on user name and password. Because user <b>carol</b> presents a wrong
-<<<<<<< HEAD
-XAUTH password the IKE negotation is aborted and the ISAKMP SA is deleted.
-=======
XAUTH password the IKE negotiation is aborted and the ISAKMP SA is deleted.
->>>>>>> upstream/4.5.1