From af2a91bdce85a4bf9a5a1283b10e08e6cb3d7ae3 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Thu, 11 Nov 2004 10:48:15 +0100
Subject: Remove CVS conflict marking.

From-SVN: r90477
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f4b7a3..7ecb894 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
-- 
cgit v1.1