projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 58fa08f)
Remove some extraneous conflict markers.
authorRichard Earnshaw <richard.earnshaw@arm.com>
Wed, 6 Feb 2002 10:31:07 +0000 (10:31 +0000)
committerRichard Earnshaw <richard.earnshaw@arm.com>
Wed, 6 Feb 2002 10:31:07 +0000 (10:31 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ce6f3ec279b7b445aa9e7288a7659ac74856c883..5f316104a895a3cacc7de497ebf3f5a5ad83ce70 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -128,7 +128,6 @@
        * language.c (_initialize_language): Ditto.
        * arc-tdep.c (_initialize_arc_tdep): Ditto.
 
->>>>>>> 1.2142
 2002-02-04  Michael Snyder  <msnyder@redhat.com>
 
        * memattr.c (_initialize_mem): Elaborate the help for 'mem' command.
@@ -412,7 +411,6 @@
        read pseudo-register as well as real register.
        (legacy_write_register_gen): Ditto.
 
->>>>>>> 1.2132
 2002-01-28  Andrew Cagney  <ac131313@redhat.com>
 
        * config/mips/tm-wince.h (TARGET_BYTE_ORDER): Delete.