diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2bb910f6c1a..cd369034126 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -39,7 +39,6 @@
 	* gcc.c-torture/compile/20010117-1.c: New test.
 	* gcc.c-torture/compile/20010117-2.c: New test.
 
->>>>>>> 1.1023
 2001-01-15  Toon Moene  <toon@moene.indiv.nluug.nl>
 
 	* g77.f-torture/execute/20010116.[fx]: New test,