2 files changed, 5 insertions, 14 deletions
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 3632774..0b2f6ec 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -162,7 +162,6 @@ void PluginView::handleEvent(Event* event)
         handleMouseEvent(static_cast<MouseEvent*>(event));
     else if (event->isKeyboardEvent())
         handleKeyboardEvent(static_cast<KeyboardEvent*>(event));
-<<<<<<< HEAD:WebCore/plugins/PluginView.cpp
 #if defined(ANDROID_PLUGINS)
     else if (event->isTouchEvent())
         handleTouchEvent(static_cast<TouchEvent*>(event));
@@ -171,10 +170,7 @@ void PluginView::handleEvent(Event* event)
     else if (event->type() == eventNames().DOMFocusInEvent)
         handleFocusEvent(true);
 #endif
-#if defined(Q_WS_X11)
-=======
 #if defined(Q_WS_X11) && ENABLE(NETSCAPE_PLUGIN_API)
->>>>>>> webkit.org at r50258.:WebCore/plugins/PluginView.cpp
     else if (event->type() == eventNames().DOMFocusOutEvent)
         handleFocusOutEvent();
     else if (event->type() == eventNames().DOMFocusInEvent)
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index c805352..8a5706f 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -292,27 +292,22 @@ namespace WebCore {
         void handleFocusOutEvent();
 #endif
 
-<<<<<<< HEAD:WebCore/plugins/PluginView.h
+#if PLATFORM(WIN_OS)
+        void paintIntoTransformedContext(HDC);
+        PassRefPtr<Image> snapshot();
+#endif
+
 #ifdef ANDROID_PLUGINS
         void handleFocusEvent(bool hasFocus);
         void handleTouchEvent(TouchEvent*);
         // called at the end of the base constructor
         void platformInit();
-=======
-#if PLATFORM(WIN_OS)
-        void paintIntoTransformedContext(HDC);
-        PassRefPtr<Image> snapshot();
->>>>>>> webkit.org at r50258.:WebCore/plugins/PluginView.h
 #endif
-<<<<<<< HEAD:WebCore/plugins/PluginView.h
 #ifdef PLUGIN_PLATFORM_SETVALUE
         // called if the default setValue does not recognize the variable
         NPError platformSetValue(NPPVariable variable, void* value);
 #endif
         
-=======
-
->>>>>>> webkit.org at r50258.:WebCore/plugins/PluginView.h
         int m_mode;
         int m_paramCount;
         char** m_paramNames;