Commit af2a91bd by Jakub Jelinek

Remove CVS conflict marking.

From-SVN: r90477
parent 2f4d9502
...@@ -407,7 +407,6 @@ ...@@ -407,7 +407,6 @@
them static. them static.
* expr.h: Remove the corresponding prototypes. * expr.h: Remove the corresponding prototypes.
>>>>>>> 2.6266
2004-11-08 Richard Earnshaw <rearnsha@arm.com> 2004-11-08 Richard Earnshaw <rearnsha@arm.com>
* arm.c (arm_handle_notshared_attribute): Wrap declaration and use * arm.c (arm_handle_notshared_attribute): Wrap declaration and use
......
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