[obvious] Kill left-over merge marker

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1ff05ab..c9ba8b2 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1041,7 +1041,6 @@
        RETVAL_EXPR for UNOP_CAST and set RETURN_TYPE to the RETURN_VALUE type
        if RETURN_TYPE is NULL.
 
->>>>>>> 1.10280
 2009-03-14  Pedro Alves  <pedro@codesourcery.com>
 
        * remote.c (PACKET_qAttached): New.