espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 01:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove leftover conflict marker.

Browse Source
This commit is contained in:
Andreas Schwab
2002-01-17 11:01:39 +00:00
parent 6826cf005f
commit ce5fe2c658
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bfd/ChangeLog
View File

@ -93,7 +93,6 @@
(xstormy16_reloc_type_lookup): Use 'table' field to locate correct (xstormy16_reloc_type_lookup): Use 'table' field to locate correct
howto entry. howto entry.
>>>>>>> 1.1263
2002-01-10 Michael Snyder <msnyder@redhat.com> 2002-01-10 Michael Snyder <msnyder@redhat.com>
* elf.c (elfcore_write_prstatus): Use long instead of pid_t; * elf.c (elfcore_write_prstatus): Use long instead of pid_t;