From: Andreas Schwab <schwab@gcc.gnu.org>
Date: Fri, 20 Aug 2004 11:37:13 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: releases/gcc-4.0.0~5712
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f76f0f890d5e4275dbd8445612d36985cc5ebd92;p=thirdparty%2Fgcc.git

Remove conflict marker.

From-SVN: r86312
---

diff --git a/ChangeLog b/ChangeLog
index 8c8fd1080fa9..6976be880423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,7 +45,6 @@
 	in the recursive `make', instead of hardwiring `all'.
 	(Autogenerated TARGET-* variables): New.
 
->>>>>>> 1.967
 2004-08-13  Brian Booth  <bbooth@redhat.com>
 
 	* MAINTAINERS: Remove myself from write-after-approval.