remove conflict marker

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e1cd54a..48280c3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -336,7 +336,6 @@
        (_initialize_infcmd): Update help string for 'until' command.
        Add new 'advance' command.
 
->>>>>>> 1.3752
 2003-01-14  David Carlton  <carlton@math.stanford.edu>
 
        * linespec.c (decode_line_1): Normalize comments.