tree 594ec027771f5dc3dd0137da2c0550aea2ee6a3d
parent 6140f0365311e6d08cdde63932c56ee741d9a605
author Matt Caswell <matt@openssl.org> 1449579659 +0000
committer Matt Caswell <matt@openssl.org> 1449579659 +0000

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>