Update.
authordrepper <drepper>
Mon, 19 Jul 1999 01:48:52 +0000 (01:48 +0000)
committerdrepper <drepper>
Mon, 19 Jul 1999 01:48:52 +0000 (01:48 +0000)
ChangeLog

index 2534a77..ae77791 100644 (file)
--- 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.