diff options
| author | Andrew Cagney <cagney@redhat.com> | 2004-04-29 22:37:53 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 2004-04-29 22:37:53 +0000 |
| commit | 43c41783a826eef9ed91d87c360f9b798d417f41 (patch) | |
| tree | 330709fa34ced71bf13a35b9b1d8588c372dd92f /gdb | |
| parent | a587af0bd533959123a4e538d3ea160530cfaf7a (diff) | |
| download | gdb-43c41783a826eef9ed91d87c360f9b798d417f41.zip gdb-43c41783a826eef9ed91d87c360f9b798d417f41.tar.gz gdb-43c41783a826eef9ed91d87c360f9b798d417f41.tar.bz2 | |
Remove >>>>> from someones long-ago commit.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 37dd1db..5380102 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -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): |