From 34f0f13bbcd8ea60670619b573146c630713177c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sun, 31 Oct 2004 22:33:16 +0000
Subject: [PATCH] x

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14331 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 ChangeLog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5ed1b4257..1d4d1c20e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
-<<<<<<< ChangeLog
 2004-10-31  Love Hörnquist Åstrand  <lha@it.su.se>
 
+	* lib/krb5/krb5.conf.5: unbreak 2b entry
+	
 	* lib/krb5/acache.c (make_cred_from_ccred): the address isn't a
 	sockaddr but rather a kerberos address, deal with that.  Based on
 	bug report from Jakob Schlyter <jakob@rfc.se>.