From: Devang Patel <dpatel@gcc.gnu.org>
Date: Tue, 22 Apr 2003 19:53:37 +0000 (-0700)
Subject: Remove conflict indicator.
X-Git-Tag: releases/gcc-3.4.0~7091
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df1b07f3b958638590d3a49c8df6d49443369952;p=thirdparty%2Fgcc.git

Remove conflict indicator.

From-SVN: r65953
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a9df83581363..ca69ac91ab0e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -63,7 +63,6 @@
 	(note_eh_region_may_contain_throw): New function.
 	* except.h (note_eh_region_may_contain_throw): New function.
 
->>>>>>> 1.17566
 2003-04-21  Mark Mitchell  <mark@codesourcery.com>
 
 	* config/i386/winnt.c (i386_pe_mark_dllimport): Revert previous