From 79669ddb86c47f6f2cfaf6bd7105b448ed29de05 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Thu, 15 Jul 2004 07:39:14 +0000
Subject: [PATCH] fix previous commit

ticket: 2637

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16601 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/include/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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