aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/testsuite/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2bb910f..cd36903 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,