Commit 62bb3fdb by Andreas Schwab

Remove conflict marker.

From-SVN: r138516
parent df8fa700
......@@ -96,7 +96,6 @@
(dwarf2out_stack_adjust): Use it.
(dwarf2out_frame_debug_expr): Likewise.
>>>>>>> .r138449
2008-07-31 Richard Guenther <rguenther@suse.de>
PR tree-optimization/36978
......
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