projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3fffcb5)
Remove the erroneous ">>>>>>> 1.419".
authorH.J. Lu <hjl.tools@gmail.com>
Fri, 12 May 2000 15:35:15 +0000 (15:35 +0000)
committerH.J. Lu <hjl.tools@gmail.com>
Fri, 12 May 2000 15:35:15 +0000 (15:35 +0000)
bfd/ChangeLog patch | blob | history

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f5141bcf136d403e95eba70a3c65dc36202feba9..ee45f0c7ed33b646a3cd4534d0188e8aa08d5bdd 100644 (file)
--- 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