diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2007-01-03 20:23:28 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2007-01-03 20:23:28 +0000 |
| commit | 1dbafe8eadbba5a16cbaddd84ce848721452b61b (patch) | |
| tree | b6265ebfcf2010efdd6dc983005f624b83918c85 /bfd | |
| parent | d5d6fca504d03e4fa016dc91935e7dbc6d1df20e (diff) | |
| download | fsf-binutils-gdb-1dbafe8eadbba5a16cbaddd84ce848721452b61b.zip fsf-binutils-gdb-1dbafe8eadbba5a16cbaddd84ce848721452b61b.tar.gz fsf-binutils-gdb-1dbafe8eadbba5a16cbaddd84ce848721452b61b.tar.bz2 | |
Remove ">>>>>>> 1.3701".
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1ffb1a8..82216d6 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 |