Fix as obvious a merge error

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3842614b4e6140ac001b65e1cfdf22e4d40d5923..89b08dd1ec8814c062bd59344ed1c739ebd42e49 100644 (file)
--- 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.