Remove conflict indicator
authorGeoffrey Keating <geoffk@gcc.gnu.org>
Sat, 2 Dec 2000 00:19:34 +0000 (00:19 +0000)
committerGeoffrey Keating <geoffk@gcc.gnu.org>
Sat, 2 Dec 2000 00:19:34 +0000 (00:19 +0000)
commit92f3752a643865e61a97ce35de03129273c6808e
treee63f14eb65f611700e68ddb76a0810d7cba0b1c2
parent27646dba39c421705f0a651bf68223680e3351e9
Remove conflict indicator

From-SVN: r37937
gcc/ChangeLog