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