Commit 4741b062 by Eric Botcazou

Remove conflict marker

From-SVN: r242871
parent d8cc3d06
......@@ -139,7 +139,6 @@
PR target/67822
* config/nvptx/mkoffload.c (main): Allow -fopenmp.
>>>>>>> .r242853
2016-11-24 Eric Botcazou <ebotcazou@adacore.com>
* common/config/sparc/sparc-common.c (sparc_option_optimization_table):
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