Skip to content
GitLab
Commit b1531d8e authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix a merge error 



Clashing function code values in evp.h

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2285)
parent b153f092
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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