diff options
| author | Geoffrey Keating <geoffk@gcc.gnu.org> | 2003-02-18 18:26:43 +0000 |
|---|---|---|
| committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2003-02-18 18:26:43 +0000 |
| commit | dce53c70a455e6067fbe6e1b22c3afd9b2676d19 (patch) | |
| tree | e65e5dfb186aa1699e70d7584ceb20e9ca16a252 | |
| parent | 59d22bc54ead399c3f918fa6d68fbbb045e14ead (diff) | |
| download | gcc-dce53c70a455e6067fbe6e1b22c3afd9b2676d19.zip gcc-dce53c70a455e6067fbe6e1b22c3afd9b2676d19.tar.gz gcc-dce53c70a455e6067fbe6e1b22c3afd9b2676d19.tar.bz2 | |
Remove conflict marker
From-SVN: r63048
| -rw-r--r-- | gcc/testsuite/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 57541bb..96d1b06 100644 --- 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. |