diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2002-01-17 11:01:39 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2002-01-17 11:01:39 +0000 |
| commit | ce5fe2c65800586593eb97e71fb44a56c801d21b (patch) | |
| tree | fbf7321272db4641b86dac7f86f2d4a24c3eaf14 | |
| parent | 6826cf005f53c6b3ee9849c40939ca381309e590 (diff) | |
| download | gdb-ce5fe2c65800586593eb97e71fb44a56c801d21b.zip gdb-ce5fe2c65800586593eb97e71fb44a56c801d21b.tar.gz gdb-ce5fe2c65800586593eb97e71fb44a56c801d21b.tar.bz2 | |
Remove leftover conflict marker.
| -rw-r--r-- | bfd/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index cd3b3f5..f366a99 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; |