diff options
Diffstat (limited to 'Source/WebCore/css')
| -rw-r--r-- | Source/WebCore/css/CSSStyleSelector.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/WebCore/css/CSSStyleSelector.cpp b/Source/WebCore/css/CSSStyleSelector.cpp index cbcdc0f..309954b 100644 --- a/Source/WebCore/css/CSSStyleSelector.cpp +++ b/Source/WebCore/css/CSSStyleSelector.cpp @@ -6053,7 +6053,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) case CSSPropertyOverflowY: ASSERT_NOT_REACHED(); return; -<<<<<<< HEAD #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: @@ -6199,8 +6198,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) } #endif -======= ->>>>>>> WebKit.org at r84325 #if ENABLE(SVG) default: // Try the SVG properties |