Remove the erroneous ">>>>>>> 1.419".
commitcb19fb59ffa3097bdfb9900ca32440bfa2ee7fbe
authorH.J. Lu <hjl@lucon.org>
Fri, 12 May 2000 15:35:15 +0000 (12 15:35 +0000)
committerH.J. Lu <hjl@lucon.org>
Fri, 12 May 2000 15:35:15 +0000 (12 15:35 +0000)
tree8b01121858f24550ea69b2b34a9cbadd2d4a3969
parent03fbf9dff377f2a357421a542f5f15a9d9951408
Remove the erroneous ">>>>>>> 1.419".
bfd/ChangeLog