| Index: third_party/WebKit/Source/core/loader/resource/XSLStyleSheetResource.h
|
| diff --git a/third_party/WebKit/Source/core/loader/resource/XSLStyleSheetResource.h b/third_party/WebKit/Source/core/loader/resource/XSLStyleSheetResource.h
|
| index 7e597e6a42039aa8f9e50edf63e509c0ac9426d8..b2a3d7821fca5cca9e87dc2d4c9697da53fe9f62 100644
|
| --- a/third_party/WebKit/Source/core/loader/resource/XSLStyleSheetResource.h
|
| +++ b/third_party/WebKit/Source/core/loader/resource/XSLStyleSheetResource.h
|
| @@ -64,6 +64,8 @@ class XSLStyleSheetResource final : public StyleSheetResource {
|
| };
|
|
|
| DEFINE_RESOURCE_TYPE_CASTS(XSLStyleSheet);
|
| +/* DO NOT SUBMIT - Conflict resolution helper:
|
| + * Above we should have XSLStyleSheet, not kXSLStyleSheet */
|
|
|
| } // namespace blink
|
|
|
|
|