Matt Caswell 686cf15e9d Fix merge error ...

Commit 6140f0365 added some new ctrl constants. However due to a
merge error one of these values was duplicated with an existing
value.

Reviewed-by: Rich Salz <rsalz@openssl.org>

2015-12-08 13:00:59 +00:00

..

internal

Identify and move OpenSSL internal header files

2015-05-14 15:13:49 +02:00

openssl

Fix merge error

2015-12-08 13:00:59 +00:00