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

21 years ago · a1c7b1260c
1 changed files with 0 additions and 1 deletions
--- 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