projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f945b4e)
Remove conflict indicator.
authorDevang Patel <dpatel@gcc.gnu.org>
Tue, 22 Apr 2003 19:53:37 +0000 (12:53 -0700)
committerDevang Patel <dpatel@gcc.gnu.org>
Tue, 22 Apr 2003 19:53:37 +0000 (12:53 -0700)
From-SVN: r65953

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a9df835813632d2c0a6f0b698679949fa3d03747..ca69ac91ab0ee77e03ae337127eef38fc0b88788 100644 (file)
--- 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