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

* Remove svn conflict marker in ChangeLog.

From-SVN: r165001
This commit is contained in:
Jonathan Wakely 2010-10-05 21:43:04 +01:00
parent c1f9afd1d3
commit c6f3b5880e

View File

@ -145,7 +145,6 @@
* configure: Regenerate.
* include/Makefile.in: Likewise.
>>>>>>> .r164755
2010-09-22 David Krauss <potswa@mac.com>
PR libstdc++/45628