remove conflicts

From-SVN: r44191

remove conflicts
From-SVN: r44191
e8919ea4 · Aldy Hernandez · 1f28c666 · e8919ea4
Commit e8919ea4 authored Jul 20, 2001 by Aldy Hernandez
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/ChangeLog
+0 -1

No files found.
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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