Remove CVS conflict marking.

From-SVN: r90477

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f4b7a361ea2fb96645f973623aaf73923d504ae..7ecb8943b291f762c009b56227744b14ff077bde 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