diff options
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/style/RenderStyle.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h index 2ea2304..674f062 100644 --- a/WebCore/rendering/style/RenderStyle.h +++ b/WebCore/rendering/style/RenderStyle.h @@ -1196,14 +1196,11 @@ public: static const Vector<StyleDashboardRegion>& noneDashboardRegions(); #endif -<<<<<<< HEAD:WebCore/rendering/style/RenderStyle.h #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR static Color initialTapHighlightColor() { return Color::tap; } #endif }; -======= ->>>>>>> webkit.org at r50258.:WebCore/rendering/style/RenderStyle.h } // namespace WebCore #endif // RenderStyle_h |