diff options
| author | Jakub Jelinek <jakub@gcc.gnu.org> | 2004-11-11 10:48:15 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2004-11-11 10:48:15 +0100 |
| commit | af2a91bdce85a4bf9a5a1283b10e08e6cb3d7ae3 (patch) | |
| tree | 52d4848ed9c02667e2d49961d7364cbd4c98d246 | |
| parent | 2f4d95024276fc29c16422589c62cd6df14a3cd3 (diff) | |
| download | gcc-af2a91bdce85a4bf9a5a1283b10e08e6cb3d7ae3.zip gcc-af2a91bdce85a4bf9a5a1283b10e08e6cb3d7ae3.tar.gz gcc-af2a91bdce85a4bf9a5a1283b10e08e6cb3d7ae3.tar.bz2 | |
Remove CVS conflict marking.
From-SVN: r90477
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3f4b7a3..7ecb894 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -407,7 +407,6 @@ them static. * expr.h: Remove the corresponding prototypes. ->>>>>>> 2.6266 2004-11-08 Richard Earnshaw <rearnsha@arm.com> * arm.c (arm_handle_notshared_attribute): Wrap declaration and use |