diff options
Diffstat (limited to 'Source/WebCore/rendering')
| -rw-r--r-- | Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp index d429bdc..28e7ddd 100644 --- a/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp +++ b/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp @@ -26,11 +26,7 @@ #include "RenderStyle.h" #include "SVGRenderSupport.h" -<<<<<<< HEAD -#if PLATFORM(SKIA) && !PLATFORM(ANDROID) -======= -#if USE(SKIA) ->>>>>>> WebKit at r80534 +#if USE(SKIA) && !PLATFORM(ANDROID) #include "PlatformContextSkia.h" #endif |