3 files changed, 7 insertions, 17 deletions
diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h
index c6555b9..bf6c157 100644
--- a/WebCore/page/ChromeClient.h
+++ b/WebCore/page/ChromeClient.h
@@ -270,13 +270,11 @@ namespace WebCore {
         virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const = 0;
         virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const = 0;
 
-<<<<<<< HEAD
+        virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) { }
+
 #if ENABLE(ANDROID_INSTALLABLE_WEB_APPS)
         virtual void webAppCanBeInstalled() = 0;
 #endif
-=======
-        virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) { }
->>>>>>> webkit.org at r68651
 
     protected:
         virtual ~ChromeClient() { }
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 2e67bf1..8e8d43b 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -159,16 +159,13 @@ Settings::Settings(Page* page)
     , m_memoryInfoEnabled(false)
     , m_interactiveFormValidation(false)
     , m_usePreHTML5ParserQuirks(false)
-<<<<<<< HEAD
+    , m_hyperlinkAuditingEnabled(false)
 #if ENABLE(WEB_AUTOFILL)
     , m_autoFillEnabled(false)
 #endif
 #ifdef ANDROID_PLUGINS
     , m_pluginsOnDemand(false)
 #endif
-=======
-    , m_hyperlinkAuditingEnabled(false)
->>>>>>> webkit.org at r68651
 {
     // A Frame may not have been created yet, so we initialize the AtomicString 
     // hash before trying to use it.
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 7a65eaa..3401428 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -395,15 +395,13 @@ namespace WebCore {
         void setUsePreHTML5ParserQuirks(bool flag) { m_usePreHTML5ParserQuirks = flag; }
         bool usePreHTML5ParserQuirks() const { return m_usePreHTML5ParserQuirks; }
 
-<<<<<<< HEAD
+        void setHyperlinkAuditingEnabled(bool flag) { m_hyperlinkAuditingEnabled = flag; }
+        bool hyperlinkAuditingEnabled() const { return m_hyperlinkAuditingEnabled; }
+
 #if ENABLE(WEB_AUTOFILL)
         void setAutoFillEnabled(bool flag) { m_autoFillEnabled = flag; }
         bool autoFillEnabled() { return m_autoFillEnabled; }
 #endif
-=======
-        void setHyperlinkAuditingEnabled(bool flag) { m_hyperlinkAuditingEnabled = flag; }
-        bool hyperlinkAuditingEnabled() const { return m_hyperlinkAuditingEnabled; }
->>>>>>> webkit.org at r68651
 
     private:
         Page* m_page;
@@ -529,16 +527,13 @@ namespace WebCore {
         bool m_memoryInfoEnabled: 1;
         bool m_interactiveFormValidation: 1;
         bool m_usePreHTML5ParserQuirks: 1;
-<<<<<<< HEAD
+        bool m_hyperlinkAuditingEnabled : 1;
 #ifdef ANDROID_PLUGINS
         bool m_pluginsOnDemand : 1;
 #endif
 #if ENABLE(WEB_AUTOFILL)
         bool m_autoFillEnabled: 1;
 #endif
-=======
-        bool m_hyperlinkAuditingEnabled : 1;
->>>>>>> webkit.org at r68651
 
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;