Commit c6f3b588 by Jonathan Wakely

2010-10-05 Jonathan Wakely <jwakely.gcc@gmail.com>

	* Remove svn conflict marker in ChangeLog.

From-SVN: r165001
parent c1f9afd1
......@@ -145,7 +145,6 @@
* configure: Regenerate.
* include/Makefile.in: Likewise.
>>>>>>> .r164755
2010-09-22 David Krauss <potswa@mac.com>
PR libstdc++/45628
......
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