From c492c977b41445c38c9ba816f457f9c522fa7161 Mon Sep 17 00:00:00 2001
From: assar <assar@FreeBSD.org>
Date: Tue, 13 Feb 2001 22:40:28 +0000
Subject: nuke conflict markers

---
 crypto/heimdal/lib/krb5/krb5_locl.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'crypto/heimdal/lib')

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
-- 
cgit v1.1