diff options
| author | Andreas Jaeger <aj@suse.de> | 2000-05-07 14:13:21 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2000-05-07 14:13:21 +0000 |
| commit | aa5f4ad8ef03d28615e0460788e0c4e3a8373122 (patch) | |
| tree | 795e7d16830204606e7d35ca6c3184841eae70b2 | |
| parent | f0a7f7424fc45166508ee6bcbe76e7fef77986c4 (diff) | |
| download | glibc-aa5f4ad8ef03d28615e0460788e0c4e3a8373122.tar.gz glibc-aa5f4ad8ef03d28615e0460788e0c4e3a8373122.tar.xz glibc-aa5f4ad8ef03d28615e0460788e0c4e3a8373122.zip | |
Removed conflict marker.
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 3e7d24f679..9332cba808 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1373,7 +1373,6 @@ * 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 |