mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-20 14:39:29 +08:00
remove conflicts
From-SVN: r44191
This commit is contained in:
parent
1f28c666af
commit
e8919ea425
@ -125,7 +125,6 @@
|
||||
previous args.
|
||||
(copy_object): Caller changed.
|
||||
|
||||
>>>>>>> 1.10722
|
||||
2001-07-19 Andreas Schwab <schwab@suse.de>
|
||||
|
||||
* configure.in (assembler dwarf2 debug_line support): Define nop
|
||||
|
Loading…
Reference in New Issue
Block a user