Commit 6aeed3e1 by Nathan Sidwell

remove conflict marker

From-SVN: r67059
parent 66804d9e
...@@ -158,7 +158,6 @@ ...@@ -158,7 +158,6 @@
* doc/invoke.texi (Option Summary, PowerPC Options): Document * doc/invoke.texi (Option Summary, PowerPC Options): Document
new options. new options.
>>>>>>> 1.17889
2003-05-19 J"orn Rennecke <joern.rennecke@superh.com> 2003-05-19 J"orn Rennecke <joern.rennecke@superh.com>
* c-decl.c (finish_decl): When setting the DECL_ASSEMBLER_NAME * c-decl.c (finish_decl): When setting the DECL_ASSEMBLER_NAME
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment