diff options
| author | Richard Earnshaw <richard.earnshaw@arm.com> | 2002-02-06 10:31:07 +0000 |
|---|---|---|
| committer | Richard Earnshaw <richard.earnshaw@arm.com> | 2002-02-06 10:31:07 +0000 |
| commit | a8ec2177956f36babd9f08ca67ac3f2974240baf (patch) | |
| tree | 2b3547c03944fe3e8f5846479f470e05a3729844 /gdb | |
| parent | 58fa08f090cbcafe7dba6835ac8ae7164e46ec0d (diff) | |
| download | gdb-a8ec2177956f36babd9f08ca67ac3f2974240baf.zip gdb-a8ec2177956f36babd9f08ca67ac3f2974240baf.tar.gz gdb-a8ec2177956f36babd9f08ca67ac3f2974240baf.tar.bz2 | |
Remove some extraneous conflict markers.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ce6f3ec..5f31610 100644 --- 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. |