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