From bf8a370221af60e613432dd7b1d5f680d194650f Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 8 Jun 2001 18:14:27 +0000
Subject: [PATCH] conflict

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43038 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 984633d..eca3773 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.7.4