Simon Butcher 76cf60beb3 Remove merge conflict marker in ssl-opt.sh ...

Commit 6346a75dfb introduced a merge conflict marker into ssl-opt.sh
by accident. This commit removes it.

2018-10-25 21:51:32 +01:00

..

.jenkins

Add Jenkinsfile for PR job

2018-10-19 15:25:10 +01:00

data_files

Merge branch 'development' into iotssl-1260-non-blocking-ecc-restricted

2018-06-13 09:52:54 +02:00

git-scripts

Add check-files.py to pre-push.sh

2018-05-21 11:41:18 +01:00

scripts

Merge remote-tracking branch 'public/pr/1951' into development

2018-08-30 00:56:56 +01:00

suites

Expand test to ensure no assumption on output

2018-10-16 11:22:45 +02:00

.gitignore

…

CMakeLists.txt

Fix generate_test_code.py argument --helpers-file in CMakeLists.txt

2018-08-06 11:42:56 +01:00

compat.sh

Add ChachaPoly ciphersuites to compat.sh

2018-06-19 13:16:30 +02:00

Descriptions.txt

…

Makefile

Wildcard possible targets and document

2018-08-06 11:42:56 +01:00

ssl-opt.sh

Remove merge conflict marker in ssl-opt.sh

2018-10-25 21:51:32 +01:00