OSDN Git Service

remove conflict indicator
authorAlan Modra <amodra@bigpond.net.au>
Fri, 10 Jun 2005 00:41:30 +0000 (00:41 +0000)
committerAlan Modra <amodra@bigpond.net.au>
Fri, 10 Jun 2005 00:41:30 +0000 (00:41 +0000)
ld/ChangeLog

index 977e4c9..de119d6 100644 (file)
        * emultempl/ppc64elf.em (ppc_before_allocation): Use
        one_lang_size_sections_pass.
 
->>>>>>> 1.1366
 2005-06-08  Aldy Hernandez  <aldyh@redhat.com>
 
        * emulparams/elf32ms1.sh: New.