From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 19 Jul 1999 01:48:52 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~27012
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a982226402abb950a184a06daffb430e55e085f7;p=external%2Fglibc.git

Update.
---

diff --git a/ChangeLog b/ChangeLog
index 2534a77..ae77791 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.