From: Nathan Sidwell <nathan@gcc.gnu.org>
Date: Wed, 23 Jun 2004 08:43:25 +0000 (+0000)
Subject: remove stray conflict marker
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=60bca1329b31cdbc0feab8d9a2b5f617aee670de;p=gcc.git

remove stray conflict marker

From-SVN: r83544
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b496a34f7ad..4068b8d23ff 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3111,7 +3111,6 @@
 	(expand_return): Don't check for possible tail recursion.
 	* tree.h (optimize_tail_recursion): Remove prototype.
 
->>>>>>> 2.4079
 2004-06-02  Jan Hubicka  <jh@suse.cz>
 
 	* tree-cfg.c (tree_find_edge_insert_loc):  Allow inserting before