From 676e4fb8542235918dccbe9c7efe7697b06dc2ae Mon Sep 17 00:00:00 2001
From: Dale Johannesen <dalej@gcc.gnu.org>
Date: Mon, 21 Oct 2002 21:58:15 +0000
Subject: [PATCH] remove > > > glitch

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 40370bfd6af..6146ec03d2f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -362,7 +362,6 @@ Sat Oct 19 10:46:52 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
 	* doc/c-tree.texi: Update description of COND_EXPR tree nodes.
 
->>>>>>> 1.15743
 2002-10-17  Geoffrey Keating  <geoffk@apple.com>
 
 	* config/rs6000/rs6000.h (HARD_REGNO_MODE_OK): Allow arbitrary modes
-- 
2.30.2