aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog1
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