d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nuke conflict markers

Browse Source
This commit is contained in:
assar 2001-02-13 22:40:28 +00:00
parent b561c64e85
commit c492c977b4
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/heimdal/lib/krb5/krb5_locl.h
View File

@ -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