OSDN Git Service

Remove conflict indicator.
authordpatel <dpatel@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 22 Apr 2003 19:53:37 +0000 (19:53 +0000)
committerdpatel <dpatel@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 22 Apr 2003 19:53:37 +0000 (19:53 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@65953 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog

index a9df835..ca69ac9 100644 (file)
@@ -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