From: Sterling Augustine <saugustine@google.com>
Date: Thu, 11 Feb 2010 19:01:17 +0000 (+0000)
Subject: Fix as obvious a merge error
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e716010d3e1c6c8e171e6063efaa0895a071a771;p=binutils-gdb.git

Fix as obvious a merge error
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3842614b4e6..89b08dd1ec8 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -30,7 +30,6 @@
 	* config/tc-ppc.c (md_show_usage): Add -mpwr4, -mpwr5, -mpwr5x,
 	-mpwr6 and -mpwr7.
 
->>>>>>> 1.4086
 2010-02-09  Sterling Augustine  <sterling@tensilica.com>
 
 	* config/tc-xtensa.c (RELAXED_LOOP_INSN_BYTES): New.