diff options
| author | Geoffrey Keating <geoffk@gcc.gnu.org> | 2000-12-02 00:19:34 +0000 |
|---|---|---|
| committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2000-12-02 00:19:34 +0000 |
| commit | 92f3752a643865e61a97ce35de03129273c6808e (patch) | |
| tree | e63f14eb65f611700e68ddb76a0810d7cba0b1c2 | |
| parent | 27646dba39c421705f0a651bf68223680e3351e9 (diff) | |
| download | gcc-92f3752a643865e61a97ce35de03129273c6808e.zip gcc-92f3752a643865e61a97ce35de03129273c6808e.tar.gz gcc-92f3752a643865e61a97ce35de03129273c6808e.tar.bz2 | |
Remove conflict indicator
From-SVN: r37937
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 82cbc8f..55af2da 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -544,7 +544,6 @@ Tue Nov 28 09:53:50 2000 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> Merge handling of -D and -U. Update handling of pending directives. Free the memory after use. ->>>>>>> 1.8477 2000-11-27 Bernd Schmidt <bernds@redhat.co.uk> * flow.c (entry_exit_blocks): Add entry for cond_local_set. |