From: Andreas Schwab <schwab@gcc.gnu.org>
Date: Fri, 1 Aug 2008 13:14:39 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: releases/gcc-4.4.0~3472
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62bb3fdb864d5eaad007ccf4c0afffc372915d5d;p=thirdparty%2Fgcc.git

Remove conflict marker.

From-SVN: r138516
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc1c2604bf55..42c6c42818b5 100644
--- 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