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 75eb6c6a62620666c1bac7bda0548ea3ff8b47f7..04be6e5877e0074f81fed2cb68a39613e9751e16 100644 (file)
--- 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.