From d5bdce497f4c22d109e3f5f213c575d2c6001785 Mon Sep 17 00:00:00 2001
From: Mike Stump <mrs@gcc.gnu.org>
Date: Fri, 25 Mar 2005 19:57:30 +0000
Subject: [PATCH] Fix typo

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 779bcf19d68..4a096a0b9d8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -55,7 +55,6 @@
 	* emit-rtl.c (reverse_comparison): Remove.
 	* rtl.h: Remove the corresponding prototype.
 
->>>>>>> 2.7995
 2005-03-24  James E Wilson  <wilson@specifixinc.com>
 
 	* doc/install.texi (--enable-altivec): Delete docs.
-- 
2.30.2