remove conflict indicator

This commit is contained in:
Alan Modra
2005-06-10 00:41:30 +00:00
parent 9d12f64cdc
commit 80f5644900

View File

@ -103,7 +103,6 @@
* emultempl/ppc64elf.em (ppc_before_allocation): Use * emultempl/ppc64elf.em (ppc_before_allocation): Use
one_lang_size_sections_pass. one_lang_size_sections_pass.
>>>>>>> 1.1366
2005-06-08 Aldy Hernandez <aldyh@redhat.com> 2005-06-08 Aldy Hernandez <aldyh@redhat.com>
* emulparams/elf32ms1.sh: New. * emulparams/elf32ms1.sh: New.