Fix merge markers in ChangeLog.

From-SVN: r123933

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bb25db03d274ae38aeece9e1e23a0bea6b4195ed..b7ca56f9666a41e91317c8d812d05c83434e948b 100644 (file)
--- 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