projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8fdf766)
Remove conflict marker.
authorMatt Kraai <kraai@gcc.gnu.org>
Fri, 30 May 2003 00:50:32 +0000 (00:50 +0000)
committerMatt Kraai <kraai@gcc.gnu.org>
Fri, 30 May 2003 00:50:32 +0000 (00:50 +0000)
From-SVN: r67239

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fe298df89c3c873fd89c7d6bc6b6711465e0b8ea..3e60d81311b48cdd7e1dbef29e8bfd724ee9c4b5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -51,7 +51,6 @@
        (expand_unreachable_stmt): Expand unreachable while statements
        using genrtl_do_stmt_1.
 
->>>>>>> 1.17950
 2003-05-29  Richard Sandiford  <rsandifo@redhat.com>
 
        * config/mips/mips-protos.h (mips_output_load_label): Declare.