From: Andreas Schwab <schwab@gcc.gnu.org>
Date: Wed, 12 Oct 2005 13:40:05 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=985943dfe64b14493be29f112a62d1fc9ead7186;p=gcc.git

Remove conflict marker.

From-SVN: r105301
---

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