Title: [245783] branches/safari-608.1.24.20-branch/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h
Revision
245783
Author
[email protected]
Date
2019-05-26 12:56:11 -0700 (Sun, 26 May 2019)

Log Message

Build fix after cherry-picking r245778.

Modified Paths

Diff

Modified: branches/safari-608.1.24.20-branch/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h (245782 => 245783)


--- branches/safari-608.1.24.20-branch/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h	2019-05-26 19:05:26 UTC (rev 245782)
+++ branches/safari-608.1.24.20-branch/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h	2019-05-26 19:56:11 UTC (rev 245783)
@@ -28,7 +28,6 @@
 
 #include <WebCore/ChromeClient.h>
 
-<<<<<<< HEAD
 namespace WebCore {
 class HTMLImageElement;
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to