* ChangeLog: Remove merge marker.

From-SVN: r199079

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af7383977a63cbddbd5155c9a28314bd6b5073d2..adfb5b29c4cb319faabbd26a58e0522ab4f50cff 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -41,7 +41,8 @@
        * lto-symtab.c (lto_symtab_merge_cgraph_nodes): Resolve cross module
        weakrefs.
        * cgraph.c (dump_cgraph_node): Do not ice on unresolved alias.
-       * cgraphunit.c (handle_alias_pairs): Store target of unresolved weakrefs.
+       * cgraphunit.c (handle_alias_pairs): Store target of unresolved
+       weakrefs.
        (output_weakrefs): Update.
 
 2013-05-17  Po-Chun Chang  <pchang9@cs.wisc.edu>
@@ -194,7 +195,6 @@
 
        * Makefile.in (tree-switch-conversion.o): Depend on $(OPTABS_H).
 
->>>>>>> .r199043
 2013-05-16  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/i386/driver-i386.c (host_detect_local_cpu): Determine