From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 12 May 2000 15:35:15 +0000 (+0000)
Subject: Remove the erroneous ">>>>>>> 1.419".
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d5d5507087557ea4d0020f8196b77aa1853b690;p=binutils-gdb.git

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

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f5141bcf136..ee45f0c7ed3 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