diff options
| author | Andreas Schwab <schwab@suse.de> | 2002-01-17 11:01:39 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2002-01-17 11:01:39 +0000 |
| commit | 44451aa9b5b2d58f62ca4d673aeb7d55770f9359 (patch) | |
| tree | f3d359257c42df968769e8a138476c8ff4ea8db7 /bfd | |
| parent | 61df8df2f18b74bdda92c403c4d3cfd29eef1604 (diff) | |
| download | gdb-44451aa9b5b2d58f62ca4d673aeb7d55770f9359.tar.gz | |
Remove leftover conflict marker.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 1 |
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; |