Remove conflict marker

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174267 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7f333e9..c60706c 100644 (file)
--- 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.