diff options
Diffstat (limited to 'WebCore/platform/graphics/Gradient.h')
| -rw-r--r-- | WebCore/platform/graphics/Gradient.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/Gradient.h b/WebCore/platform/graphics/Gradient.h index 371cad7..b6911f3 100644 --- a/WebCore/platform/graphics/Gradient.h +++ b/WebCore/platform/graphics/Gradient.h @@ -63,13 +63,10 @@ typedef class PlatformGradientRec* PlatformGradient; class SkShader; typedef class SkShader* PlatformGradient; typedef class SkShader* PlatformPattern; -<<<<<<< HEAD #endif -======= #elif PLATFORM(HAIKU) class BGradient; typedef BGradient* PlatformGradient; ->>>>>>> webkit.org at r58033 #else typedef void* PlatformGradient; #endif |