diff options
Diffstat (limited to 'WebCore/page/Settings.h')
| -rw-r--r-- | WebCore/page/Settings.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h index d1ffdbe..8d02d7c 100644 --- a/WebCore/page/Settings.h +++ b/WebCore/page/Settings.h @@ -499,13 +499,10 @@ namespace WebCore { bool m_html5TreeBuilderEnabled: 1; // Will be deleted soon, do not use. bool m_paginateDuringLayoutEnabled : 1; bool m_dnsPrefetchingEnabled : 1; -<<<<<<< HEAD:WebCore/page/Settings.h + bool m_memoryInfoEnabled: 1; #ifdef ANDROID_PLUGINS bool m_pluginsOnDemand : 1; #endif -======= - bool m_memoryInfoEnabled: 1; ->>>>>>> webkit.org at r63859:WebCore/page/Settings.h #if USE(SAFARI_THEME) static bool gShouldPaintNativeControls; |