diff options
| author | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-06-01 08:51:05 +0000 |
|---|---|---|
| committer | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-06-01 08:51:05 +0000 |
| commit | ca2e246e7b95cbd28b244310d4b84201054d7491 (patch) | |
| tree | 5efde83b220feaa87c6e5109c7e0780bb1c6a211 | |
| parent | 4631d202401f678f26c43884b8091d0a231385c3 (diff) | |
| download | gcc-ca2e246e7b95cbd28b244310d4b84201054d7491.tar.gz | |
Remove conflict marker.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125260 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 2c65050cac4..1acce9d669a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. |