diff options
| author | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-02 00:19:34 +0000 |
|---|---|---|
| committer | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-02 00:19:34 +0000 |
| commit | 73fe30b91a323a93b19faa4157773ff51677941e (patch) | |
| tree | e63f14eb65f611700e68ddb76a0810d7cba0b1c2 | |
| parent | 8c03ddcf79843bbe63937b6776c8f18d78331570 (diff) | |
| download | ppe42-gcc-73fe30b91a323a93b19faa4157773ff51677941e.tar.gz ppe42-gcc-73fe30b91a323a93b19faa4157773ff51677941e.zip | |
Remove conflict indicator
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37937 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 82cbc8f6014..55af2da6f31 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. |
