Title: [224482] trunk/Source/WebCore/ChangeLog
- Revision
- 224482
- Author
- m...@apple.com
- Date
- 2017-11-05 23:53:40 -0800 (Sun, 05 Nov 2017)
Log Message
Unreviewed. Remove stray conflict markers from ChangeLog.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (224481 => 224482)
--- trunk/Source/WebCore/ChangeLog 2017-11-06 07:04:02 UTC (rev 224481)
+++ trunk/Source/WebCore/ChangeLog 2017-11-06 07:53:40 UTC (rev 224482)
@@ -6759,10 +6759,8 @@
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 <cdu...@apple.com>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
