diff options
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 2534a77bb1..ae77791374 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,7 +76,6 @@ * sysdeps/generic/bits/types.h: Likewise. * posix/sys/types.h: Define suseconds_t for X/Open. ->>>>>>> 1.2438 1999-07-15 Ulrich Drepper <drepper@cygnus.com> * stdio-common/bug1.c: Avoid memory leak. |