diff options
| author | Nathan Sidwell <nathan@gcc.gnu.org> | 2003-05-21 11:14:22 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2003-05-21 11:14:22 +0000 |
| commit | 6aeed3e155be801f9ed019cc91f922e97958368c (patch) | |
| tree | a332d51347893428d45bb1ec7251fc75085ebf6a | |
| parent | 66804d9eecb746c42d4daf50ae0565334ddcd03a (diff) | |
| download | gcc-6aeed3e155be801f9ed019cc91f922e97958368c.zip gcc-6aeed3e155be801f9ed019cc91f922e97958368c.tar.gz gcc-6aeed3e155be801f9ed019cc91f922e97958368c.tar.bz2 | |
remove conflict marker
From-SVN: r67059
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4dc4a1d..2e75ec4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -158,7 +158,6 @@ * doc/invoke.texi (Option Summary, PowerPC Options): Document new options. ->>>>>>> 1.17889 2003-05-19 J"orn Rennecke <joern.rennecke@superh.com> * c-decl.c (finish_decl): When setting the DECL_ASSEMBLER_NAME |