diff options
Diffstat (limited to 'JavaScriptCore/parser')
| -rw-r--r-- | JavaScriptCore/parser/Parser.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/JavaScriptCore/parser/Parser.cpp b/JavaScriptCore/parser/Parser.cpp index 5092357..33b5213 100644 --- a/JavaScriptCore/parser/Parser.cpp +++ b/JavaScriptCore/parser/Parser.cpp @@ -35,13 +35,10 @@ namespace JSC { void Parser::parse(JSGlobalObject* lexicalGlobalObject, FunctionParameters* parameters, JSParserStrictness strictness, JSParserMode mode, int* errLine, UString* errMsg) { -<<<<<<< HEAD #ifdef ANDROID_INSTRUMENT android::TimeCounter::start(android::TimeCounter::JavaScriptParseTimeCounter); #endif -======= ASSERT(lexicalGlobalObject); ->>>>>>> webkit.org at r70209 m_sourceElements = 0; int defaultErrLine; |