From: Uros Bizjak <uros@gcc.gnu.org>
Date: Sun, 19 May 2013 10:10:58 +0000 (+0200)
Subject: * ChangeLog: Remove merge marker.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e242068731a13571c1a0099c06a0b7820f34c0c4;p=gcc.git

* ChangeLog: Remove merge marker.

From-SVN: r199079
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af7383977a6..adfb5b29c4c 100644
--- 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