Remove conflict marker.

From-SVN: r138516
This commit is contained in:
Andreas Schwab 2008-08-01 13:14:39 +00:00
parent df8fa7003b
commit 62bb3fdb86

View File

@ -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