diff options
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 2fca4f4..425d69c 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -35,10 +35,7 @@ LOCAL_SRC_FILES := \ bytecode/StructureStubInfo.cpp \ \ bytecompiler/BytecodeGenerator.cpp \ -<<<<<<< HEAD:JavaScriptCore/Android.mk -======= bytecompiler/NodesCodegen.cpp \ ->>>>>>> webkit.org at r51976:JavaScriptCore/Android.mk \ debugger/Debugger.cpp \ debugger/DebuggerActivation.cpp \ |