fix merge markers

From-SVN: r142001

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8c14705db7b8f9a498449e285ab2cd7b859775d5..32d678088356a49f33dba5b9092068e90b265231 100644 (file)
--- 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.