From: Eric Botcazou <ebotcazou@gcc.gnu.org>
Date: Thu, 26 May 2011 08:53:05 +0000 (+0000)
Subject: Remove conflict marker
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1651e703484940d8ea0fd098c28b25c5b0e2f862;p=gcc.git

Remove conflict marker

From-SVN: r174267
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7f333e99f44..c60706c275d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -191,7 +191,6 @@
 	* ipa.c (function_and_variable_visibility): Only add to same
 	comdat group list if DECL_ONE_ONLY.
 
->>>>>>> .r174265
 2011-05-25  Andrey Belevantsev  <abel@ispras.ru>
 
 	PR rtl-optimization/49014
@@ -756,7 +755,7 @@
 	TRUTH_AND_EXPR, TRUTH_OR_EXPR, and TRUTH_XOR_EXPR.
 	(gimplify_expr): Move TRUTH_AND|OR|XOR_EXPR to its binary form.
 
-2011-05-19  Anatoly Sokolov <aesok@post.ru>
+2011-05-19  Anatoly Sokolov  <aesok@post.ru>
 	    Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* config/t-sol2 (sol2.o): Add $(TARGET_H) dependency.