projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2043964)
Remove ">>>>>>> 1.2917".
authorH.J. Lu <hjl.tools@gmail.com>
Fri, 26 May 2006 17:09:48 +0000 (17:09 +0000)
committerH.J. Lu <hjl.tools@gmail.com>
Fri, 26 May 2006 17:09:48 +0000 (17:09 +0000)
gas/ChangeLog patch | blob | history

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2cbc170d214883b74c3f74e9da9af868b73e2eec..039badef731e59426a14cc7ed3414fa01491b6b9 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