diff options
Diffstat (limited to 'Source/WebCore/plugins')
| -rw-r--r-- | Source/WebCore/plugins/PluginViewNone.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/WebCore/plugins/PluginViewNone.cpp b/Source/WebCore/plugins/PluginViewNone.cpp index c0d0e4a..383ac49 100644 --- a/Source/WebCore/plugins/PluginViewNone.cpp +++ b/Source/WebCore/plugins/PluginViewNone.cpp @@ -28,10 +28,7 @@ #if USE(JSC) #include "BridgeJSC.h" -<<<<<<< HEAD -======= #include <runtime/ScopeChain.h> ->>>>>>> WebKit at r80534 #endif using namespace WTF; |