diff options
Diffstat (limited to 'WebCore/page/Settings.cpp')
| -rw-r--r-- | WebCore/page/Settings.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp index 66ffcf0..acfe23a 100644 --- a/WebCore/page/Settings.cpp +++ b/WebCore/page/Settings.cpp @@ -161,16 +161,13 @@ Settings::Settings(Page* page) , m_interactiveFormValidation(false) , m_usePreHTML5ParserQuirks(false) , m_hyperlinkAuditingEnabled(false) -<<<<<<< HEAD + , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false) #if ENABLE(WEB_AUTOFILL) , m_autoFillEnabled(false) #endif #ifdef ANDROID_PLUGINS , m_pluginsOnDemand(false) #endif -======= - , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false) ->>>>>>> webkit.org at r70949 { // A Frame may not have been created yet, so we initialize the AtomicString // hash before trying to use it. |