Fix some clashing symbol numbers due to merge conflict
authorMatt Caswell <matt@openssl.org>
Thu, 20 Oct 2016 16:27:59 +0000 (17:27 +0100)
committerMatt Caswell <matt@openssl.org>
Fri, 4 Nov 2016 12:09:46 +0000 (12:09 +0000)
commitd02ef3d0be3b2cb1e6b3905ad26fc03ec261b317
tree2d49c375237b9094087f9f15578e93df575d613e
parent7714dc5ea1174ca50cd12e5013683284f66c2dd3
Fix some clashing symbol numbers due to merge conflict

Reviewed-by: Rich Salz <rsalz@openssl.org>
include/openssl/ssl.h