remove conflict indicator
This commit is contained in:
parent
9d12f64cdc
commit
80f5644900
1 changed files with 0 additions and 1 deletions
|
@ -103,7 +103,6 @@
|
|||
* 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.
|
||||
|
|
Loading…
Reference in a new issue