From: Richard Earnshaw <richard.earnshaw@arm.com>
Date: Wed, 6 Feb 2002 10:31:07 +0000 (+0000)
Subject: Remove some extraneous conflict markers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a8ec2177956f36babd9f08ca67ac3f2974240baf;p=binutils-gdb.git

Remove some extraneous conflict markers.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ce6f3ec279b..5f316104a89 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.