From acb5223fb5a7fb8cd6ea3cc12c6b25b6c6d5c920 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Fri, 8 Jun 2001 14:14:27 -0400
Subject: [PATCH] conflict

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 984633dcb03..eca3773a2a8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -176,7 +176,6 @@ Thu Jun  7 12:12:58 CEST 2001  Jan Hubicka  <jh@suse.cz>
 
 	* emit-rtl.c (operand_subword): Remove unused variable.
 
->>>>>>> 1.10284
 Wed Jun  6 14:51:05 CEST 2001  Jan Hubicka  <jh@suse.cz>
 
 	* i386.md (floatdi?f): Avoid usinf of SSE instructions
-- 
2.30.2