2 files changed, 0 insertions, 30 deletions
diff --git a/WebCore/plugins/PluginInfoStore.cpp b/WebCore/plugins/PluginInfoStore.cpp
index 9a441f3..88dc7ee 100644
--- a/WebCore/plugins/PluginInfoStore.cpp
+++ b/WebCore/plugins/PluginInfoStore.cpp
@@ -27,15 +27,7 @@
 #include "PluginInfoStore.h"
 
 #include "KURL.h"
-<<<<<<< HEAD:WebCore/plugins/PluginInfoStore.cpp
-#if PLATFORM(ANDROID)
-=======
->>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp
 #include "Page.h"
-<<<<<<< HEAD:WebCore/plugins/PluginInfoStore.cpp
-#endif
-=======
->>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp
 #include "PluginData.h"
 #include "PluginDatabase.h"
 #include "PluginPackage.h"
@@ -102,21 +94,7 @@ bool PluginInfoStore::supportsMIMEType(const WebCore::String& mimeType)
 
 void refreshPlugins(bool reloadOpenPages)
 {
-<<<<<<< HEAD:WebCore/plugins/PluginInfoStore.cpp
-#if PLATFORM(ANDROID)
-=======
->>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp
     Page::refreshPlugins(reloadOpenPages);
-<<<<<<< HEAD:WebCore/plugins/PluginInfoStore.cpp
-#else
-    PluginDatabase::installedPlugins()->refresh();
-
-    if (reloadOpenPages) {
-        // FIXME: reload open pages
-    }
-#endif
-=======
->>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp
 }
 
 }
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index dd2458e..a5618f7 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -47,15 +47,11 @@
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
-<<<<<<< HEAD:WebCore/plugins/PluginView.h
 #ifdef PLUGIN_SCHEDULE_TIMER
 #include "PluginTimer.h"
 #endif
 
-#if PLATFORM(WIN_OS) && PLATFORM(QT)
-=======
 #if PLATFORM(WIN_OS) && (PLATFORM(QT) || PLATFORM(WX))
->>>>>>> webkit.org at r51976:WebCore/plugins/PluginView.h
 typedef struct HWND__* HWND;
 typedef HWND PlatformPluginWidget;
 #elif defined(ANDROID_PLUGINS)
@@ -354,15 +350,11 @@ namespace WebCore {
         bool m_haveUpdatedPluginWidget;
 #endif
 
-<<<<<<< HEAD:WebCore/plugins/PluginView.h
 #ifdef PLUGIN_SCHEDULE_TIMER
         PluginTimerList m_timerList;
 #endif
 
-#if (PLATFORM(QT) && PLATFORM(WIN_OS)) || defined(XP_MACOSX)
-=======
 #if ((PLATFORM(QT) || PLATFORM(WX)) && PLATFORM(WIN_OS)) || defined(XP_MACOSX)
->>>>>>> webkit.org at r51976:WebCore/plugins/PluginView.h
         // On Mac OSX and Qt/Windows the plugin does not have its own native widget,
         // but is using the containing window as its reference for positioning/painting.
         PlatformPluginWidget m_window;