Remove conflict marker
authorGeoffrey Keating <geoffk@gcc.gnu.org>
Tue, 18 Feb 2003 18:26:43 +0000 (18:26 +0000)
committerGeoffrey Keating <geoffk@gcc.gnu.org>
Tue, 18 Feb 2003 18:26:43 +0000 (18:26 +0000)
commitdce53c70a455e6067fbe6e1b22c3afd9b2676d19
treee65e5dfb186aa1699e70d7584ceb20e9ca16a252
parent59d22bc54ead399c3f918fa6d68fbbb045e14ead
Remove conflict marker

From-SVN: r63048
gcc/testsuite/ChangeLog