commit 76cf60beb32f9bb95489e8682371b77a6d6b60be
author Simon Butcher <simon.butcher@arm.com> Thu Oct 25 21:51:32 2018 +0100
committer Simon Butcher <simon.butcher@arm.com> Thu Oct 25 21:51:32 2018 +0100
tree fc3774a4c08d93083fa3c5e44eafd92dfe9b8e2a
parent 169712e15ac142412063d3fcae1894ac9e7e9e6c

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

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 7c408e4..ce9aee2 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -5242,7 +5242,6 @@
             -C "mbedtls_pk_verify.*4b00" \
             -C "mbedtls_ecdh_make_public.*4b00" \
             -C "mbedtls_pk_sign.*4b00"
-=======
 
 # Tests of asynchronous private key support in SSL