From c0123a9a6c13bfd9e8932c1699ccb8038cbab34a Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Wed, 19 Nov 2008 08:34:50 -0500
Subject: [PATCH] fix merge markers

From-SVN: r142001
---
 gcc/testsuite/ChangeLog | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8c14705db7b8..32d678088356 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -7,22 +7,20 @@
 
 2008-11-13  Uros Bizjak  <ubizjak@gmail.com>
 
-<<<<<<< .working
 	Backport from mainline:
 	2008-06-06  Uros Bizjak <ubizjak@gmail.com>
-=======
-	PR c++/38030
-	* g++.dg/template/lookup8.C: New test.
-
-	PR c++/37740
-	* g++.dg/cpp0x/initlist8.C: New test.
->>>>>>> .merge-right.r141866
 
 	PR rtl-optimization/36438
 	* gcc.target/i386/pr36438.c
 
 2008-11-13  Jason Merrill  <jason@redhat.com>
 
+	PR c++/38030
+	* g++.dg/template/lookup8.C: New test.
+
+	PR c++/37740
+	* g++.dg/cpp0x/initlist8.C: New test.
+
 	PR c++/37932
 	* g++.dg/conversion/bitfield11.C: New test.
 
-- 
2.47.2