Remove spurious conflict marker
authorNathanael Nerode <neroden@gcc.gnu.org>
Tue, 3 Aug 2004 20:33:52 +0000 (20:33 +0000)
committerNathanael Nerode <neroden@gcc.gnu.org>
Tue, 3 Aug 2004 20:33:52 +0000 (20:33 +0000)
commitb522f768aba8391c18c16353cf42cc576ec88c06
treeaf8a7d775180ee48a8e30e93fceee9a9966be981
parent3b0727a0e981692fa3732ad7e13d06abb35c9516
Remove spurious conflict marker

From-SVN: r85499
gcc/ChangeLog