projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 59d22bc)
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)
From-SVN: r63048

gcc/testsuite/ChangeLog patch | blob | history

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 57541bb6f664b329bc46a472903b925bd773b712..96d1b0646bcf5c7753b7f3d7b1f8affca140d60d 100644 (file)
--- 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.