2010-10-05 Jonathan Wakely <jwakely.gcc@gmail.com>
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 5 Oct 2010 20:43:04 +0000 (20:43 +0000)
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 5 Oct 2010 20:43:04 +0000 (20:43 +0000)
commit51aff00b07c0058a85adc41688a021b155154dcc
tree7d01a631ce0ce1c4455f4ba815481018f5878ece
parentdd6b3fc939da6bb4ba17fa86d2a45bf0585dc493
2010-10-05  Jonathan Wakely  <jwakely.gcc@gmail.com>

* Remove svn conflict marker in ChangeLog.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165001 138bc75d-0d04-0410-961f-82ee72b054a4
libstdc++-v3/ChangeLog