Title: [213732] trunk/Source/WebKit2/ChangeLog
- Revision
- 213732
- Author
- msab...@apple.com
- Date
- 2017-03-10 15:47:42 -0800 (Fri, 10 Mar 2017)
Log Message
Cleaned up merge markers inadvertently left in the file.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (213731 => 213732)
--- trunk/Source/WebKit2/ChangeLog 2017-03-10 22:56:06 UTC (rev 213731)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-10 23:47:42 UTC (rev 213732)
@@ -322,7 +322,6 @@
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
-<<<<<<< .mine
2017-03-09 Michael Saboff <msab...@apple.com>
Add plumbing to WebProcess to enable _javascript_Core configuration and logging
@@ -371,8 +370,6 @@
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):
-||||||| .r213687
-=======
2017-03-09 John Wilander <wilan...@apple.com>
Resource Load Statistics: Remove statistics data as part of full website data removal
@@ -404,7 +401,6 @@
Both WebsiteDataStore::removeData() functions now cover resource load
statistics.
->>>>>>> .r213688
2017-03-09 Brady Eidson <beid...@apple.com>
Add WKURLSchemeHandler API for handling custom protocols.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
