diff options
Diffstat (limited to 'WebCore/bindings/js/ScriptObject.cpp')
| -rw-r--r-- | WebCore/bindings/js/ScriptObject.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/bindings/js/ScriptObject.cpp b/WebCore/bindings/js/ScriptObject.cpp index 0e62903..03ecfc6 100644 --- a/WebCore/bindings/js/ScriptObject.cpp +++ b/WebCore/bindings/js/ScriptObject.cpp @@ -36,15 +36,9 @@ #include <runtime/JSLock.h> #if ENABLE(INSPECTOR) -<<<<<<< HEAD:WebCore/bindings/js/ScriptObject.cpp -======= #include "JSInjectedScriptHost.h" ->>>>>>> webkit.org at r51976:WebCore/bindings/js/ScriptObject.cpp #include "JSInspectorBackend.h" -<<<<<<< HEAD:WebCore/bindings/js/ScriptObject.cpp -======= #include "JSInspectorFrontendHost.h" ->>>>>>> webkit.org at r51976:WebCore/bindings/js/ScriptObject.cpp #endif using namespace JSC; |