Commit 5fda945d by Andreas Schwab

Remove conflict marker.

From-SVN: r125260
parent b7e6d1da
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment