Fixup merge conflicts in util/libeay.num
authorRichard Levitte <levitte@openssl.org>
Sun, 6 Sep 2015 12:13:00 +0000 (14:13 +0200)
committerRichard Levitte <levitte@openssl.org>
Sun, 6 Sep 2015 12:13:00 +0000 (14:13 +0200)
commit8af6082e16a02b4bad63de99fd3e6bc3501ee2b8
tree35cf0149daf6481a8d4fa07f61d4bf395b3fe48d
parenta60994df34fe6a694441471c7f8dcf9661fb091d
Fixup merge conflicts in util/libeay.num

Reviewed-by: Stephen Henson <steve@openssl.org>
util/libeay.num