Remove conflict marker.

From-SVN: r125260
This commit is contained in:
Andreas Schwab 2007-06-01 08:51:05 +00:00
parent b7e6d1da6e
commit 5fda945dd9
1 changed files with 0 additions and 1 deletions

View File

@ -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.