diff options
Diffstat (limited to 'crypto/heimdal/lib/krb5/krb5_locl.h')
| -rw-r--r-- | crypto/heimdal/lib/krb5/krb5_locl.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/heimdal/lib/krb5/krb5_locl.h b/crypto/heimdal/lib/krb5/krb5_locl.h index 53692d5..0d15772 100644 --- a/crypto/heimdal/lib/krb5/krb5_locl.h +++ b/crypto/heimdal/lib/krb5/krb5_locl.h @@ -110,9 +110,6 @@ struct sockaddr_dl; #include <parse_time.h> #include <base64.h> -<<<<<<< krb5_locl.h -#include <openssl/des.h> -======= #ifdef HAVE_OPENSSL_DES_H #include <openssl/des.h> #else @@ -121,7 +118,6 @@ struct sockaddr_dl; #ifdef HAVE_OPENSSL_MD4_H #include <openssl/md4.h> #else ->>>>>>> 1.1.1.2 #include <md4.h> #endif #ifdef HAVE_OPENSSL_MD5_H |
