remove conflicts

From-SVN: r44191
This commit is contained in:
Aldy Hernandez 2001-07-20 10:36:09 +00:00
parent 1f28c666af
commit e8919ea425

View File

@ -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