From 88ca4f908490be552e8df5864fb7bd8aa65e810a Mon Sep 17 00:00:00 2001
From: bbooth <bbooth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 22 Jul 2004 18:35:08 +0000
Subject: [PATCH] 	fix typo.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3672398b9cc..1c220812d4a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1514,7 +1514,6 @@
 
 	* collect2.c (main):  Handle --no-demangle and --demangle flags.
 
->>>>>>> 2.4547
 2004-07-13  Sebastian Pop  <pop@cri.ensmp.fr>
 
 	* Makefile.in (OBJS-common): Add tree-data-ref.o.
-- 
2.11.4.GIT