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