about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-05-07 14:13:21 +0000
committerAndreas Jaeger <aj@suse.de>2000-05-07 14:13:21 +0000
commitaa5f4ad8ef03d28615e0460788e0c4e3a8373122 (patch)
tree795e7d16830204606e7d35ca6c3184841eae70b2 /ChangeLog
parentf0a7f7424fc45166508ee6bcbe76e7fef77986c4 (diff)
downloadglibc-aa5f4ad8ef03d28615e0460788e0c4e3a8373122.tar.gz
glibc-aa5f4ad8ef03d28615e0460788e0c4e3a8373122.tar.xz
glibc-aa5f4ad8ef03d28615e0460788e0c4e3a8373122.zip
Removed conflict marker.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
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