From 1d5cf8dc28d2a6b2ea22dbe8eb66db1b4f93c584 Mon Sep 17 00:00:00 2001
From: mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 25 Mar 2005 19:57:30 +0000
Subject: [PATCH] Fix typo

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 779bcf19d683..4a096a0b9d81 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.47.3