diff options
Diffstat (limited to 'WebCore/platform/android')
| -rw-r--r-- | WebCore/platform/android/FileSystemAndroid.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/platform/android/FileSystemAndroid.cpp b/WebCore/platform/android/FileSystemAndroid.cpp index 5ab8929..66bb976 100644 --- a/WebCore/platform/android/FileSystemAndroid.cpp +++ b/WebCore/platform/android/FileSystemAndroid.cpp @@ -28,11 +28,7 @@ #include "config.h" #include "FileSystem.h" -<<<<<<< HEAD #include "PlatformBridge.h" -#include "StringBuilder.h" -======= ->>>>>>> webkit.org at r70209 #include "cutils/log.h" #include <dirent.h> #include <dlfcn.h> |