Remove merge conflict characters.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 01e8152..f0c47cd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -70,7 +70,6 @@
        * breakpoint.c (print_one_breakpoint): Do not output spaces
        after printing <PENDING> for a pending breakpoint.
 
->>>>>>> 1.5456
 2004-02-23  Jeff Johnston  <jjohnstn@redhat.com>
 
        * printcmd.c (print_scalar_formatted): Initialize val_long