Remove conflict marker.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 941007b..4d78b4d 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