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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 37dd1db373dd4522a6ca66fc0b6a00230af8506b..53801029886a5dfd92851005073a147e36deeb81 100644 (file)
--- 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):