diff options
| author | Jeffrey D. Oldham <oldham@gcc.gnu.org> | 2001-01-10 00:51:39 +0000 |
|---|---|---|
| committer | Jeffrey D. Oldham <oldham@gcc.gnu.org> | 2001-01-10 00:51:39 +0000 |
| commit | c4923b10a80fda0edd35e2bab3749672f697e855 (patch) | |
| tree | 78252757959d0b6dc97d82d87cf05b60f6f17b83 | |
| parent | 3ee816a413e346dda445add7874f0e43c7353a4c (diff) | |
| download | gcc-c4923b10a80fda0edd35e2bab3749672f697e855.zip gcc-c4923b10a80fda0edd35e2bab3749672f697e855.tar.gz gcc-c4923b10a80fda0edd35e2bab3749672f697e855.tar.bz2 | |
Remove unintentional merge indicators.
From-SVN: r38845
| -rw-r--r-- | gcc/testsuite/ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8c43e6c..ba17bf6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -146,7 +146,6 @@ * gcc.dg/format-xopen-1.c: Rename to gcc.dg/format/xopen-1.c. * gcc.dg/formatz-1.c: Rename to gcc.dg/format/z-1.c. ->>>>>>> 1.986 2001-01-05 Alexandre Oliva <aoliva@redhat.com> * gcc.c-torture/execute/991228-1.c: Take word endianness into @@ -160,7 +159,6 @@ * g++.old-deja/g++.pt/crash62.C: New test. ->>>>>>> 1.973 2001-01-04 Richard Henderson <rth@redhat.com> * gcc.dg/20000926-1.c: Update expected warnings. |