diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2000-06-05 17:00:32 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-06-05 17:00:32 +0000 |
| commit | 83adf9da649087e9289af876fc4c4b47d0e96b62 (patch) | |
| tree | 6e50fabf6f3019372dcba6479c945748e68257f0 | |
| parent | 88a19424c64b30a89f5c5ee2769cc3b3964d48a8 (diff) | |
| download | gcc-83adf9da649087e9289af876fc4c4b47d0e96b62.zip gcc-83adf9da649087e9289af876fc4c4b47d0e96b62.tar.gz gcc-83adf9da649087e9289af876fc4c4b47d0e96b62.tar.bz2 | |
Oops, remove conflict marker
From-SVN: r34406
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index eb06dc2..6158fc7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -37,7 +37,6 @@ * c-parse.y, c-parse.c, c-parse.h: Regenerate. * objc/objc-parse.y, objc/objc-parse.c: Regenerate. ->>>>>>> 1.6841 Mon Jun 5 06:46:28 2000 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> * alias.c (get_alias_set): If compnent is addressable, use alias |