summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-24 07:08:27 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-24 07:08:27 +0000
commitd479b4ea1c90d71c19c070f3c8d6e870723b957f (patch)
tree432bff85c2a9c6cae19d4acecb4140e951c031a3 /ChangeLog
parent9b26f5c47dd7efd663119d02e2d2e3d9886c422c (diff)
downloadglibc-d479b4ea1c90d71c19c070f3c8d6e870723b957f.tar.gz
glibc-d479b4ea1c90d71c19c070f3c8d6e870723b957f.tar.xz
glibc-d479b4ea1c90d71c19c070f3c8d6e870723b957f.zip
Update.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2086314328..d4c707fcdd 100644
--- 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