diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9ca78fe1036..6e8c90bb8f1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,15 +1,12 @@
-<<<<<<< .mine
 2005-11-18  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/8355
 	* g++.dg/template/friend39.C: New test.
 
-=======
 2005-11-18  James E Wilson  <wilson@specifix.com>
 
 	* gcc.dg/builtin-strstr.c: New.
 
->>>>>>> .r107206
 2005-11-18  Richard Henderson  <rth@redhat.com>
 
 	* gcc.target/ia64/20010423-1.c, gcc.target/ia64/20020313-1.c,