From 4ce02fc7ebebf2f31599180e65b5926ee0b615a7 Mon Sep 17 00:00:00 2001
From: vprus <vprus>
Date: Tue, 23 Mar 2010 21:34:30 +0000
Subject: [PATCH] Remove conflict marker.

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1d67755087..f801b41e2b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -39,7 +39,6 @@
 	* mi/mi-cmd-break (mi_cmd_break_commands): Validate commands if
 	it's tracepoint.
 
-=======
 2010-03-23  Mike Frysinger  <vapier@gentoo.org>
 
 	* Makefile.in (OPCODES_CFLAGS): Add -I$(OPCODES_SRC)/..
-- 
2.11.0