diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2000-05-12 15:35:15 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2000-05-12 15:35:15 +0000 |
| commit | 3d5d5507087557ea4d0020f8196b77aa1853b690 (patch) | |
| tree | 6225c5b0adbf92f5ac07a04c471944d7ce89fd8a /bfd | |
| parent | 3fffcb5ea7e48a4b4365adfe82bdabc6e41a6804 (diff) | |
| download | gdb-3d5d5507087557ea4d0020f8196b77aa1853b690.zip gdb-3d5d5507087557ea4d0020f8196b77aa1853b690.tar.gz gdb-3d5d5507087557ea4d0020f8196b77aa1853b690.tar.bz2 | |
Remove the erroneous ">>>>>>> 1.419".
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 f5141bc..ee45f0c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -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 |