From 1b88d5c487d0f28d15eb9d61dc752cfb1b609125 Mon Sep 17 00:00:00 2001
From: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Tue, 31 Mar 2009 22:39:27 +0000
Subject: [obvious] Kill left-over merge marker

---
 gdb/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gdb/ChangeLog')

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1ff05ab..c9ba8b2 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.
-- 
cgit v1.1