From: H.J. Lu <hjl@lucon.org>
Date: Fri, 12 May 2000 15:35:15 +0000 (+0000)
Subject: Remove the erroneous ">>>>>>> 1.419".
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9ce438b3257f8b6f4c151881e95d0f9b544774fe;p=pf3gnuchains%2Fpf3gnuchains3x.git

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

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