From: Andreas Schwab <schwab@gcc.gnu.org>
Date: Fri, 1 Jun 2007 08:51:05 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: releases/gcc-4.3.0~4787
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fda945dd9670937fc1e8ed6635220ab336f8f73;p=thirdparty%2Fgcc.git

Remove conflict marker.

From-SVN: r125260
---

diff --git a/ChangeLog b/ChangeLog
index 2c65050cac48..1acce9d669ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -468,7 +468,6 @@
 	install-gcc.
 	* Makefile.in: Regenerate.
 
->>>>>>> .merge-right.r70
 2006-12-04  Richard Guenther  <rguenther@suse.de>
 
 	* MAINTAINERS (Non-Algorithmic Maintainers): New section.