Remove >>>>> from someones long-ago commit.

This commit is contained in:
Andrew Cagney 2004-04-29 22:37:53 +00:00
parent a587af0bd5
commit 43c41783a8
1 changed files with 0 additions and 1 deletions

View File

@ -345,7 +345,6 @@
* rs6000-tdep.c (registers_e500, registers_7400): Doc fixes.
>>>>>>> 1.5719
2004-04-19 Daniel Jacobowitz <drow@mvista.com>
* dwarf2read.c (dwarf2_tmp_obstack, dwarf2_free_tmp_obstack):