From 6fb8dd83d6356dbb6b8a398a404c0f85fc055c93 Mon Sep 17 00:00:00 2001
From: Mike Wrighton <wrighton@codesourcery.com>
Date: Mon, 17 Sep 2012 19:29:52 +0000
Subject: [PATCH] Correcting error in gdb/Changelog from previous commit.

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 31ff310d22d..1190f3ef89c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -179,7 +179,6 @@
 	(DECLARE_REGISTRY): Declare struct TAG ## _data.  Use the tagged
 	callback typedefs.
 
->>>>>>> 1.14670
 2012-09-12  Doug Evans  <dje@google.com>
 
 	* dwarf2read.c (dwarf2_read_addr_index): Fix handling the case where
-- 
2.30.2