mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-09 04:21:49 +08:00
remove conflict indicator
This commit is contained in:
parent
9d12f64cdc
commit
80f5644900
@ -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 New Issue
Block a user