Commit f8e7e41a by R. Kelley Cook

eliminate conflict indicator

From-SVN: r72583
parent 4c4809c1
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
(machopic_legitimize_pic_address): Improve codegen in dynamic-no-pic (machopic_legitimize_pic_address): Improve codegen in dynamic-no-pic
case. case.
>>>>>>> 2.1435
2003-10-15 Gbor Lki <alga@rgai.hu> 2003-10-15 Gbor Lki <alga@rgai.hu>
* fold-const.c (tree_swap_operands_p): Disable some features * fold-const.c (tree_swap_operands_p): Disable some features
......
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