From be16c6202adb7544b9017594a51ceb85b3b65692 Mon Sep 17 00:00:00 2001
From: markm <markm@FreeBSD.org>
Date: Thu, 24 Feb 2000 13:37:41 +0000
Subject: Merge conflicts.

---
 crypto/heimdal/kdc/headers.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'crypto/heimdal/kdc')

diff --git a/crypto/heimdal/kdc/headers.h b/crypto/heimdal/kdc/headers.h
index 845b2a5..118e0d8 100644
--- a/crypto/heimdal/kdc/headers.h
+++ b/crypto/heimdal/kdc/headers.h
@@ -33,6 +33,7 @@
 
 /* 
  * $Id: headers.h,v 1.6 2000/02/06 06:04:36 assar Exp $ 
+ * $FreeBSD$ 
  */
 
 #ifndef __HEADERS_H__
@@ -79,7 +80,7 @@
 #include <getarg.h>
 #include <base64.h>
 #include <parse_units.h>
-#include <des.h>
+#include <openssl/des.h>
 #include <krb5.h>
 #include <hdb.h>
 #include <hdb_err.h>
-- 
cgit v1.1