projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d5d6fca)
Remove ">>>>>>> 1.3701".
authorH.J. Lu <hjl.tools@gmail.com>
Wed, 3 Jan 2007 20:23:28 +0000 (20:23 +0000)
committerH.J. Lu <hjl.tools@gmail.com>
Wed, 3 Jan 2007 20:23:28 +0000 (20:23 +0000)
bfd/ChangeLog patch | blob | history

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1ffb1a8eb92cd0f178cd241de5df36cfce903c8f..82216d69382b1c9343288d787d1c5dbf3e4b605d 100644 (file)
--- 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