remove conflict marker

From-SVN: r67059

remove conflict marker
From-SVN: r67059
6aeed3e1 · Nathan Sidwell · 66804d9e · 6aeed3e1
Commit 6aeed3e1 authored May 21, 2003 by Nathan Sidwell
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/ChangeLog
+0 -1

No files found.
--- 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