projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 74be08f)
Remove conflict marker around 2006-05-07.
authorBen Elliston <bje@gcc.gnu.org>
Tue, 9 May 2006 05:25:08 +0000 (15:25 +1000)
committerBen Elliston <bje@gcc.gnu.org>
Tue, 9 May 2006 05:25:08 +0000 (15:25 +1000)
From-SVN: r113643

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc786cdc7b8a15da9a03f4c94f41d87ef56b510f..5da06aef385f57334ec8fb50a9c8552d27e6069b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -64,7 +64,6 @@
        * tree-ssa-structalias.c (get_constraint_for_component_ref):
        Do not try to find zero-sized subvars.
 
->>>>>>> .r113631
 2006-05-07  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/27136
@@ -566,7 +565,6 @@
        * basic-block.h (safe_insert_insn_on_edge): Removed.
        * cfgrtl.c (mark_killed_regs, safe_insert_insn_on_edge): Removed.
 
-
 2006-04-26  David Edelsohn  <edelsohn@gnu.org>
            Paolo Bonzini  <bonzini@gnu.org>