diff options
| author | Steve Block <steveblock@google.com> | 2011-06-08 12:35:22 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 12:39:36 +0100 |
| commit | 93eaf9c284f99fb80cf1de27f40f032c84fc34e8 (patch) | |
| tree | 632f17361ef94a4599f89c13ae9e7c80aee121c9 | |
| parent | 3d1195ca6a380e5af16e3a505a007369cf18a4db (diff) | |
| download | external_webkit-93eaf9c284f99fb80cf1de27f40f032c84fc34e8.zip external_webkit-93eaf9c284f99fb80cf1de27f40f032c84fc34e8.tar.gz external_webkit-93eaf9c284f99fb80cf1de27f40f032c84fc34e8.tar.bz2 | |
Fix a whitespace diff with upstream to avoid a future merge conflict
Change-Id: Ia6d9bd8b0a8cd99a569599034b6138e29d89b24d
| -rw-r--r-- | Source/WebCore/bridge/jni/JavaMethod.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/WebCore/bridge/jni/JavaMethod.cpp b/Source/WebCore/bridge/jni/JavaMethod.cpp index 69dc99b..60620a0 100644 --- a/Source/WebCore/bridge/jni/JavaMethod.cpp +++ b/Source/WebCore/bridge/jni/JavaMethod.cpp @@ -35,7 +35,6 @@ #include <runtime/JSObject.h> #include <runtime/ScopeChain.h> #endif - #include <wtf/text/StringBuilder.h> using namespace JSC; |