From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Thu, 15 Jul 2004 07:39:14 +0000 (+0000)
Subject: fix previous commit
X-Git-Tag: krb5-1.4-beta1~206
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=79669ddb86c47f6f2cfaf6bd7105b448ed29de05;p=krb5.git

fix previous commit

ticket: 2637

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16601 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 75eb6c6a6..04be6e587 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -32,7 +32,6 @@
 	* fake-addrinfo.h (in6addr_any): If we need to define a static
 	copy, rename it with a macro first.
 
->>>>>>> 1.444
 2004-07-09  Ken Raeburn  <raeburn@mit.edu>
 
 	* k5-thread.h: Test HAVE_PTHREAD instead of HAVE_PTHREAD_H.