Remove leftover conflict marker.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cd3b3f56a35f53169c9b07445eebae40655b3b08..f366a997c9e745cee670e46a67168d2388a92306 100644 (file)
--- 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;