Correcting error in gdb/Changelog from previous commit.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 31ff310d22d53f63c009eb1d40ec1edc2e37c59b..1190f3ef89ccb6ed63b1b4238e18581c42fe4a99 100644 (file)
--- 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