From f65559575d271b779772617518100284a74ef882 Mon Sep 17 00:00:00 2001
From: Eric Christopher <echristo@gcc.gnu.org>
Date: Tue, 17 Apr 2007 22:47:58 +0000
Subject: [PATCH] Fix merge markers in ChangeLog.

From-SVN: r123933
---
 gcc/testsuite/ChangeLog | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bb25db03d27..b7ca56f9666 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