Remove conflict indicator.

From-SVN: r65953

Remove conflict indicator.
From-SVN: r65953
df1b07f3 · Devang Patel · f945b4e0 · df1b07f3
Commit df1b07f3 authored Apr 22, 2003 by Devang Patel
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/ChangeLog
+0 -1

No files found.
--- 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