Remove stray conflict marker.
authorBen Elliston <bje@gcc.gnu.org>
Wed, 15 Aug 2007 00:40:52 +0000 (10:40 +1000)
committerBen Elliston <bje@gcc.gnu.org>
Wed, 15 Aug 2007 00:40:52 +0000 (10:40 +1000)
commitb331beb75c4d19ff67e636e929062defd3eeb0a0
treec5a89b70916d7fa6f6e1bedcba6fb69e6eda0b4b
parent991df44f3a392709a7bbaf30d618582e9ab62a2b
Remove stray conflict marker.

From-SVN: r127504
gcc/ChangeLog