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

Remove stray conflict marker.

Browse Source
This commit is contained in:
Jim Blandy
2002-07-24 03:05:07 +00:00
parent f7321c061e
commit b8ae0f7e61
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gdb/ChangeLog
View File

@ -258,7 +258,6 @@
* config/d30v/d30v.mt: Ditto. * config/d30v/d30v.mt: Ditto.
* config/d30v/tm-d30v.h: Ditto. * config/d30v/tm-d30v.h: Ditto.
>>>>>>> 1.2930
2002-07-13 Aidan Skinner <aidan@velvet.net> 2002-07-13 Aidan Skinner <aidan@velvet.net>
* ada-tasks.c (add_task_entry): replace calls to * ada-tasks.c (add_task_entry): replace calls to