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

Remove the erroneous ">>>>>>> 1.419".

Browse Source
This commit is contained in:
H.J. Lu
2000-05-12 15:35:15 +00:00
parent 3fffcb5ea7
commit 3d5d550708
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

@ -187,7 +187,6 @@ Mon May 1 16:56:47 2000 Jim Wilson <wilson@cygnus.com>
* coff-sh.c (bfd_coff_small_swap_table): Fix Fri Apr 28 change. * coff-sh.c (bfd_coff_small_swap_table): Fix Fri Apr 28 change.
* vms.c (vms_openr_next_archived_file): Return NULL. * vms.c (vms_openr_next_archived_file): Return NULL.
>>>>>>> 1.419
Fri Apr 28 21:34:44 2000 Clinton Popetz <cpopetz@cygnus.com> Fri Apr 28 21:34:44 2000 Clinton Popetz <cpopetz@cygnus.com>
* coffcode.h Copy changes mistakenly done to libcoff.h in * coffcode.h Copy changes mistakenly done to libcoff.h in