projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: baa93fa)
remove conflict marker
authorChristopher Faylor <me+cygwin@cgf.cx>
Thu, 30 Jan 2003 01:42:01 +0000 (01:42 +0000)
committerChristopher Faylor <me+cygwin@cgf.cx>
Thu, 30 Jan 2003 01:42:01 +0000 (01:42 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e1cd54ac38eda9ed7e6b886296150b2958956d0f..48280c30f14ec56048592bc535266b1de3c105d0 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.