Remove ">>>>>>> 1.2917".

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2cbc170..039bade 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -53,7 +53,6 @@
        missing -march options. Document .set arch=CPU. Move .set smartmips
        to ASE page. Use @code for .set FOO examples.
 
->>>>>>> 1.2917
 2006-05-23  Jie Zhang  <jie.zhang@analog.com>
 
        * config/tc-bfin.c (bfin_start_line_hook): Bump line counters