| Index: third_party/WebKit/Source/core/loader/resource/ImageResource.h
|
| diff --git a/third_party/WebKit/Source/core/loader/resource/ImageResource.h b/third_party/WebKit/Source/core/loader/resource/ImageResource.h
|
| index 53082f99cfdd6f0c3e562593b718d7b49fc8d2c2..07eba9936d6ff2284d19d471361f9acefb05b41c 100644
|
| --- a/third_party/WebKit/Source/core/loader/resource/ImageResource.h
|
| +++ b/third_party/WebKit/Source/core/loader/resource/ImageResource.h
|
| @@ -173,6 +173,8 @@ class CORE_EXPORT ImageResource final
|
| };
|
|
|
| DEFINE_RESOURCE_TYPE_CASTS(Image);
|
| +/* DO NOT SUBMIT - Conflict resolution helper:
|
| + * Above we should have Image, not kImage */
|
|
|
| } // namespace blink
|
|
|
|
|