Commit e6058208 by Nathan Sidwell

remove conflict indicators

From-SVN: r96790
parent f5d39c3d
......@@ -495,7 +495,6 @@
(arc_rodata_string, TARGET_OPTIONS): Delete.
* config/arc/arc.opt: New file.
>>>>>>> 2.7930
2005-03-17 Richard Henderson <rth@redhat.com>
* doc/extend.texi (Weak Pragmas): New section.
......
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