| 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 accceb9a300b15c662f74e03652a1f8f0cc91770..327643865e47a766230b4e47c057b0ab1efd7fb8 100644
|
| --- a/third_party/WebKit/Source/core/loader/resource/ImageResource.h
|
| +++ b/third_party/WebKit/Source/core/loader/resource/ImageResource.h
|
| @@ -166,6 +166,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
|
|
|
|
|