mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-26 22:07:58 +08:00
Remove the erroneous ">>>>>>> 1.419".
This commit is contained in:
@ -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.
|
||||
* vms.c (vms_openr_next_archived_file): Return NULL.
|
||||
|
||||
>>>>>>> 1.419
|
||||
Fri Apr 28 21:34:44 2000 Clinton Popetz <cpopetz@cygnus.com>
|
||||
|
||||
* coffcode.h Copy changes mistakenly done to libcoff.h in
|
||||
|
Reference in New Issue
Block a user