diff options
| author | Gerald Pfeifer <gerald@gcc.gnu.org> | 2000-11-09 08:48:30 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@gcc.gnu.org> | 2000-11-09 08:48:30 +0000 |
| commit | 54d87db8696d7dd6307ba7f5e54ec27a22d42348 (patch) | |
| tree | ee0d730796d47c22fcc7a34ea4c19bfb6a016595 /gcc | |
| parent | 97dc9fc0df347fd40fbbbf3ba84cf172f551d80b (diff) | |
| download | gcc-54d87db8696d7dd6307ba7f5e54ec27a22d42348.zip gcc-54d87db8696d7dd6307ba7f5e54ec27a22d42348.tar.gz gcc-54d87db8696d7dd6307ba7f5e54ec27a22d42348.tar.bz2 | |
* Remove overlooked conflict marker.
From-SVN: r37337
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3c6f2df..5f1bd77 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -83,7 +83,6 @@ Wed Nov 8 21:53:41 MET 2000 Jan Hubicka <jh@suse.cz> * expr.c (expand_expr) [ADDR_EXPR]: Handle when op0 is RETURN_DECL passed in multiple non-contiguous locations. ->>>>>>> 1.8198 2000-11-08 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> * README.gnat: Remove file. |