Get rid of conflit markers added to ChangeLog in r195837
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Jan 2016 23:30:09 +0000 (23:30 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Jan 2016 23:30:09 +0000 (23:30 +0000)
commit2eba17117ae0731e2d0e22363b4e6d487b516806
tree0e67433eb48d067d36a52d77b2f9b86eb73998b2
parentefb4a1bf391233eb6ac5451f27e847478739921c
Get rid of conflit markers added to ChangeLog in r195837

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@195853 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog