diff options
| author | Andreas Schwab <schwab@gcc.gnu.org> | 2007-06-01 08:51:05 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2007-06-01 08:51:05 +0000 |
| commit | 5fda945dd9670937fc1e8ed6635220ab336f8f73 (patch) | |
| tree | 5efde83b220feaa87c6e5109c7e0780bb1c6a211 /ChangeLog | |
| parent | b7e6d1da6e1e0d4b29071f7bb0625807742f63ab (diff) | |
| download | gcc-5fda945dd9670937fc1e8ed6635220ab336f8f73.zip gcc-5fda945dd9670937fc1e8ed6635220ab336f8f73.tar.gz gcc-5fda945dd9670937fc1e8ed6635220ab336f8f73.tar.bz2 | |
Remove conflict marker.
From-SVN: r125260
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -468,7 +468,6 @@ install-gcc. * Makefile.in: Regenerate. ->>>>>>> .merge-right.r70 2006-12-04 Richard Guenther <rguenther@suse.de> * MAINTAINERS (Non-Algorithmic Maintainers): New section. |