From: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Tue, 31 Mar 2009 22:39:27 +0000 (+0000)
Subject: [obvious] Kill left-over merge marker
X-Git-Tag: sid-snapshot-20090901~1289
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0ab7f7fff17e89d3a01dd720b4c857120af6dd95;p=pf3gnuchains%2Fpf3gnuchains4x.git

[obvious] Kill left-over merge marker
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1ff05abe35..c9ba8b2f83 100644
--- 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.