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)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@224482 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog

index 56735f4..d8f88aa 100644 (file)
         Unreviewed, add missing copyright header to ServiceWorkerClientType.idl.
 
         * workers/service/ServiceWorkerClientType.idl:
-=======
         * platform/Cursor.cpp: Previously, excluded on iOS now wrapped in #if
         * platform/sql/SQLiteDatabase.h: remove debugging data member from release builds.
->>>>>>> build fixes
 
 2017-10-25  Chris Dumez  <cdumez@apple.com>