Commit 95c0f198 authored by Bodo Möller's avatar Bodo Möller
Browse files

fix warning (due to an error during manual conflict resolution)

parent 947a85d0

crypto/crypto.h

+0 −1
Changes for crypto/crypto.h: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ extern "C" { 
#define	CRYPTO_LOCK_MALLOC2		26

#define	CRYPTO_LOCK_DSO			27

#define	CRYPTO_LOCK_DYNLOCK		28

#define	CRYPTO_NUM_LOCKS		29

#define	CRYPTO_LOCK_ENGINE		29

#define	CRYPTO_NUM_LOCKS		30