From 15f5aab6f88ad35569749aec5186a5fc873b9b9d Mon Sep 17 00:00:00 2001
From: Richard Kenner <kenner@gcc.gnu.org>
Date: Wed, 3 May 2000 20:38:04 -0400
Subject: [PATCH] Remove conflict indicator

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fd3622c9c2f..78035c1e225 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -52,7 +52,6 @@ Wed May  3 12:55:46 2000  Jim Wilson  <wilson@cygnus.com>
 	(DECL_POINTER_DEPTH): Add macro.
 	(tree_decl): Add pointer_depth member.
 
->>>>>>> 1.6472
 Wed May  3 22:52:53 2000  Denis Chertykov  <denisc@overta.ru>
 
 	* config/avr/avr-protos.h (test_hard_reg_class): Declared.