diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2006-05-26 17:09:48 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2006-05-26 17:09:48 +0000 |
| commit | a1c7b1260c0f37fb7c01d41a89e507d814e5969c (patch) | |
| tree | 78baeacbed2f5d5a41f35a26f89e5fad94935f73 | |
| parent | 2043964ee277d5dce4737b43ac235c4f796f08b5 (diff) | |
| download | binutils-gdb-a1c7b1260c0f37fb7c01d41a89e507d814e5969c.tar.gz | |
Remove ">>>>>>> 1.2917".
| -rw-r--r-- | gas/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
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 |