From: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Thu, 11 Nov 2004 09:48:15 +0000 (+0100)
Subject: Remove CVS conflict marking.
X-Git-Tag: releases/gcc-4.0.0~3217
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af2a91bdce85a4bf9a5a1283b10e08e6cb3d7ae3;p=thirdparty%2Fgcc.git

Remove CVS conflict marking.

From-SVN: r90477
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f4b7a361ea2..7ecb8943b291 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -407,7 +407,6 @@
 	them static.
 	* expr.h: Remove the corresponding prototypes.
 
->>>>>>> 2.6266
 2004-11-08  Richard Earnshaw  <rearnsha@arm.com>
 
 	* arm.c (arm_handle_notshared_attribute): Wrap declaration and use