Remove conflict marker

From-SVN: r63048

Remove conflict marker
From-SVN: r63048
dce53c70 · Geoffrey Keating · 59d22bc5 · dce53c70
Commit dce53c70 authored Feb 18, 2003 by Geoffrey Keating
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/testsuite/ChangeLog
+0 -1

No files found.
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -176,7 +176,6 @@ Mon Feb  3 16:05:11 CET 2003  Jan Hubicka  <jh@suse.cz>
 	* gcc.c-torture/exectue/ieee/20000320-1.c: The ARM VFP format is
 	'natural-endian'.

->>>>>>> 1.2408
 2003-02-01  Richard Sandiford  <rsandifo@redhat.com>

 	* g++.dg/init/new1.C: Remove -fvolatile dg-options line.