summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4dc4a1d0ce9..2e75ec468ac 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -158,7 +158,6 @@
* doc/invoke.texi (Option Summary, PowerPC Options): Document
new options.
->>>>>>> 1.17889
2003-05-19 J"orn Rennecke <joern.rennecke@superh.com>
* c-decl.c (finish_decl): When setting the DECL_ASSEMBLER_NAME
OpenPOWER on IntegriCloud