Commit 985943df by Andreas Schwab

Remove conflict marker.

From-SVN: r105301
parent 39e837db
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
Only apply the optimization for rounding builtins if the inner Only apply the optimization for rounding builtins if the inner
cast is also an extension. cast is also an extension.
>>>>>>> 2.10143
2005-10-11 Andrew Pinski <pinskia@physics.uc.edu> 2005-10-11 Andrew Pinski <pinskia@physics.uc.edu>
PR tree-opt/23946 PR tree-opt/23946
......
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