Unreviewed 'merge' fix.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 28 Jul 2014 16:02:03 +0000 (16:02 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 28 Jul 2014 16:02:03 +0000 (16:02 +0000)
commit9fc3b6dc7efd2da6980cc55e6eb8828bf08ae355
treeb56e27867feebc4b761f4c7ae8fe346b6765ba8b
parent1d2eba53373702698b1e648651792d6b930be1e7
Unreviewed 'merge' fix.

* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
Correct line endings to allow EWS merges again.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171678 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp