From 76cf60beb32f9bb95489e8682371b77a6d6b60be Mon Sep 17 00:00:00 2001
From: Simon Butcher <simon.butcher@arm.com>
Date: Thu, 25 Oct 2018 21:51:32 +0100
Subject: [PATCH] Remove merge conflict marker in ssl-opt.sh

Commit 6346a75dfb96 introduced a merge conflict marker into ssl-opt.sh
by accident. This commit removes it.
---
 tests/ssl-opt.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 7c408e406..ce9aee28a 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -5242,7 +5242,6 @@ run_test    "EC restart: TLS, max_ops=1000, ECDHE-PSK" \
             -C "mbedtls_pk_verify.*4b00" \
             -C "mbedtls_ecdh_make_public.*4b00" \
             -C "mbedtls_pk_sign.*4b00"
-=======
 
 # Tests of asynchronous private key support in SSL