Remove leftover conflict marker.
authorAndreas Schwab <schwab@linux-m68k.org>
Thu, 17 Jan 2002 11:01:39 +0000 (11:01 +0000)
committerAndreas Schwab <schwab@linux-m68k.org>
Thu, 17 Jan 2002 11:01:39 +0000 (11:01 +0000)
commitce5fe2c65800586593eb97e71fb44a56c801d21b
treefbf7321272db4641b86dac7f86f2d4a24c3eaf14
parent6826cf005f53c6b3ee9849c40939ca381309e590
Remove leftover conflict marker.
bfd/ChangeLog