diff options
Diffstat (limited to 'WebCore/Android.mk')
| -rw-r--r-- | WebCore/Android.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/Android.mk b/WebCore/Android.mk index eadb310..acb6285 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -292,13 +292,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ html/parser/CSSPreloadScanner.cpp \ html/ColorInputType.cpp \ html/DOMFormData.cpp \ -<<<<<<< HEAD - html/DOMTokenList.cpp \ - html/DateComponents.cpp \ -======= html/DOMSettableTokenList.cpp \ html/DOMTokenList.cpp \ ->>>>>>> webkit.org at r70949 + html/DateComponents.cpp \ html/DateInputType.cpp \ html/DateTimeInputType.cpp \ html/DateTimeLocalInputType.cpp \ |