diff options
| author | Nathan Sidwell <nathan@gcc.gnu.org> | 2005-03-21 12:33:15 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2005-03-21 12:33:15 +0000 |
| commit | e6058208b0cd6d6e5b2c1aba25502c362453d5d2 (patch) | |
| tree | 42e7bd151a8739c469220a348021dd39f673097c | |
| parent | f5d39c3d74dc91f2faf190114251226cc1f8b433 (diff) | |
| download | gcc-e6058208b0cd6d6e5b2c1aba25502c362453d5d2.zip gcc-e6058208b0cd6d6e5b2c1aba25502c362453d5d2.tar.gz gcc-e6058208b0cd6d6e5b2c1aba25502c362453d5d2.tar.bz2 | |
remove conflict indicators
From-SVN: r96790
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2e947ea..e16a312 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -495,7 +495,6 @@ (arc_rodata_string, TARGET_OPTIONS): Delete. * config/arc/arc.opt: New file. ->>>>>>> 2.7930 2005-03-17 Richard Henderson <rth@redhat.com> * doc/extend.texi (Weak Pragmas): New section. |