Update.
authordrepper <drepper>
Fri, 24 Apr 1998 07:08:27 +0000 (07:08 +0000)
committerdrepper <drepper>
Fri, 24 Apr 1998 07:08:27 +0000 (07:08 +0000)
ChangeLog

index 2086314..d4c707f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 1998-04-23 22:43  Ulrich Drepper  <drepper@cygnus.com>
 
        * elf/dl-load.c (fillin_rpath): Handle empty element returned by