Commit 748f7574 by Eric Botcazou

Remove conflict marker

From-SVN: r173756
parent e6242bc7
......@@ -129,7 +129,6 @@
* configure.ac: Use AS_HELP_STRING throughout.
* configure: Regenerate.
>>>>>>> .r173734
2011-05-12 H.J. Lu <hongjiu.lu@intel.com>
* config/i386/i386.c (ix86_save_reg): Change maybe_eh_return to bool.
......
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