Remove conflict marker.

From-SVN: r138516

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc1c260..42c6c42 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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