Removed conflict marker.
authoraj <aj>
Sun, 7 May 2000 14:13:21 +0000 (14:13 +0000)
committeraj <aj>
Sun, 7 May 2000 14:13:21 +0000 (14:13 +0000)
ChangeLog

index 3e7d24f..9332cba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
        * sysdeps/mips/dl-machine.h: Update some comments.
        (ELF_MACHINE_ALIGN_MASK): Removed, it's not needed.
 
        * sysdeps/mips/dl-machine.h: Update some comments.
        (ELF_MACHINE_ALIGN_MASK): Removed, it's not needed.
 
->>>>>>> 1.3514
 2000-04-11  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/bits/posix_opt.h: Add
 2000-04-11  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/bits/posix_opt.h: Add