summaryrefslogtreecommitdiffstats
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 88fbe054d00..c28b22e48d3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -57,7 +57,6 @@
* gcc.dg/cpp/redef2.c: Update.
* gcc.dg/cpp/skipping.c: New test.
->>>>>>> 1.929
2000-12-07 Geoffrey Keating <geoffk@redhat.com>
* g++.old-deja/g++.other/eh3.C: New testcase.
OpenPOWER on IntegriCloud