r165001 - /trunk/libstdc++-v3/ChangeLog

[redi@gcc.gnu.org]

Author: redi
Date: Tue Oct  5 20:43:04 2010
New Revision: 165001

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=165001
Log:
2010-10-05  Jonathan Wakely  <jwakely.gcc@gmail.com>

	* Remove svn conflict marker in ChangeLog.

Modified:
    trunk/libstdc++-v3/ChangeLog