diff options
| author | Eric Christopher <echristo@gcc.gnu.org> | 2007-04-17 22:47:58 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gcc.gnu.org> | 2007-04-17 22:47:58 +0000 |
| commit | f65559575d271b779772617518100284a74ef882 (patch) | |
| tree | 0c5922254cc00346046dcd426ebc2304e4e47391 /gcc | |
| parent | 7c11b28c577a0a55db07641d3c78501464e0f9bc (diff) | |
| download | gcc-f65559575d271b779772617518100284a74ef882.zip gcc-f65559575d271b779772617518100284a74ef882.tar.gz gcc-f65559575d271b779772617518100284a74ef882.tar.bz2 | |
Fix merge markers in ChangeLog.
From-SVN: r123933
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bb25db0..b7ca56f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -81,7 +81,6 @@ * g++.dg/warn/anonymous-namespace-1.C: New test * g++.dg/warn/anonymous-namespace-1.h: New test ->>>>>>> .r123913 2007-04-14 Andrew Pinski <andrew_pinski@playstation.sony.com> PR testsuite/31578 @@ -119,7 +118,7 @@ * g++.dg/gomp/pr25874.C: Add dg-options. 2007-04-14 Bernhard Fischer <aldot@gcc.gnu.org> - + PR fortran/21061 * gfortran.dg/warnings_are_errors_1.f90: New testcase. * gfortran.dg/warnings_are_errors_1.f: New testcase. @@ -251,7 +250,6 @@ * lib/target-supports.exp (check_effective_target_fstack_protector): Rewrite. ->>>>>>> .r123860 2007-04-09 Mark Mitchell <mark@codesourcery.com> PR c++/31449 |