remove conflict marker
From-SVN: r67059
This commit is contained in:
parent
66804d9eec
commit
6aeed3e155
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user