From: Ben Elliston <bje@gcc.gnu.org>
Date: Tue, 9 May 2006 05:25:08 +0000 (+1000)
Subject: Remove conflict marker around 2006-05-07.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5038b1e9dd5cd970e1928e8b6244d0636fafd2d2;p=gcc.git

Remove conflict marker around 2006-05-07.

From-SVN: r113643
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc786cdc7b8..5da06aef385 100644
--- 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>