Unreviewed. Remove stray conflict markers from ChangeLog.
authormjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Nov 2017 07:53:40 +0000 (07:53 +0000)
committermjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Nov 2017 07:53:40 +0000 (07:53 +0000)
commit43be97069f9f68ffc683219a537b2bc11563d55d
treef828e02ca02986324fa3dffcfa020ae235e3f3b4
parent856d0e83bc0b5f480589d0b710130d74e7b321e8
Unreviewed. Remove stray conflict markers from ChangeLog.

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