From 985943dfe64b14493be29f112a62d1fc9ead7186 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@gcc.gnu.org>
Date: Wed, 12 Oct 2005 13:40:05 +0000
Subject: [PATCH] Remove conflict marker.

From-SVN: r105301
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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
-- 
2.30.2