From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 3 Jan 2007 20:23:28 +0000 (+0000)
Subject: Remove ">>>>>>> 1.3701".
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1dbafe8eadbba5a16cbaddd84ce848721452b61b;p=binutils-gdb.git

Remove ">>>>>>> 1.3701".
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1ffb1a8eb92..82216d69382 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -121,7 +121,6 @@
 	* elf64-alpha.c (elf64_alpha_merge_symbol_attribute): New function.
 	(elf_backend_merge_symbol_attribute): Define.
 
->>>>>>> 1.3701
 2006-12-04  Jan Beulich  <jbeulich@novell.com>
 
 	* elflink.c (_bfd_elf_link_create_dynamic_sections): Don't create