diff options
Diffstat (limited to 'WebCore/Android.derived.v8bindings.mk')
| -rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index d852246..b5c3ada 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -142,11 +142,8 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) # HTML GEN := \ $(intermediates)/bindings/V8Blob.h \ -<<<<<<< HEAD - $(intermediates)/bindings/V8DOMFormData.h \ -======= $(intermediates)/bindings/V8BlobBuilder.h \ ->>>>>>> webkit.org at r61871 + $(intermediates)/bindings/V8DOMFormData.h \ $(intermediates)/bindings/V8DataGridColumn.h \ $(intermediates)/bindings/V8DataGridColumnList.h \ $(intermediates)/bindings/V8File.h \ |