summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cd3b3f56a35..f366a997c9e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -93,7 +93,6 @@
(xstormy16_reloc_type_lookup): Use 'table' field to locate correct
howto entry.
->>>>>>> 1.1263
2002-01-10 Michael Snyder <msnyder@redhat.com>
* elf.c (elfcore_write_prstatus): Use long instead of pid_t;