Remove CVS conflict marking.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90477 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f4b7a3..7ecb894 100644 (file)
--- 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