diff options
Diffstat (limited to 'WebCore/css/CSSStyleSelector.cpp')
| -rw-r--r-- | WebCore/css/CSSStyleSelector.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp index 881bf74..b0201a3 100644 --- a/WebCore/css/CSSStyleSelector.cpp +++ b/WebCore/css/CSSStyleSelector.cpp @@ -5603,7 +5603,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) if (m_style->setFontDescription(fontDescription)) m_fontDirty = true; return; -<<<<<<< HEAD + } #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: @@ -5749,9 +5749,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) } #endif -======= - } ->>>>>>> webkit.org at r70949 #if ENABLE(SVG) default: // Try the SVG properties |