From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 26 May 2006 17:09:48 +0000 (+0000)
Subject: Remove ">>>>>>> 1.2917".
X-Git-Tag: newlib-csl-sourcerygxx-3_4_4-25~437
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1c7b1260c0f37fb7c01d41a89e507d814e5969c;p=thirdparty%2Fbinutils-gdb.git

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

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2cbc170d214..039badef731 100644
--- 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