diff options
Diffstat (limited to 'src/include/ChangeLog')
| -rw-r--r-- | src/include/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
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. |