Remove conflict marker.

From-SVN: r105301

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 941007b810eccdffe5de593e6028cbe8d7beb067..4d78b4d72a1fd4e565be40588047005348f6af25 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -50,7 +50,6 @@
        Only apply the optimization for rounding builtins if the inner
        cast is also an extension.
 
->>>>>>> 2.10143
 2005-10-11  Andrew Pinski  <pinskia@physics.uc.edu>
 
        PR tree-opt/23946