Skip to content
Commit 331c16d9 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix a merge error 



Fix an error code clash due to a merge

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2665)
parent 73540f47
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment