projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f47a1d2)
[obvious] Kill left-over merge marker
authorPaul Pluzhnikov <ppluzhnikov@google.com>
Tue, 31 Mar 2009 22:39:27 +0000 (22:39 +0000)
committerPaul Pluzhnikov <ppluzhnikov@google.com>
Tue, 31 Mar 2009 22:39:27 +0000 (22:39 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1ff05abe353306e918af9c8a92570ee80e9fdd7d..c9ba8b2f8334bda8dbed453f03bf1a482e33adb3 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.