Commit e8919ea4 by Aldy Hernandez

remove conflicts

From-SVN: r44191
parent 1f28c666
...@@ -125,7 +125,6 @@ ...@@ -125,7 +125,6 @@
previous args. previous args.
(copy_object): Caller changed. (copy_object): Caller changed.
>>>>>>> 1.10722
2001-07-19 Andreas Schwab <schwab@suse.de> 2001-07-19 Andreas Schwab <schwab@suse.de>
* configure.in (assembler dwarf2 debug_line support): Define nop * configure.in (assembler dwarf2 debug_line support): Define nop
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment