Remove conflict marker
From-SVN: r63048
This commit is contained in:
parent
59d22bc54e
commit
dce53c70a4
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user