From 93eaf9c284f99fb80cf1de27f40f032c84fc34e8 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 8 Jun 2011 12:35:22 +0100
Subject: Fix a whitespace diff with upstream to avoid a future merge conflict

Change-Id: Ia6d9bd8b0a8cd99a569599034b6138e29d89b24d
---
 Source/WebCore/bridge/jni/JavaMethod.cpp | 1 -
 1 file changed, 1 deletion(-)

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;
-- 
cgit v1.1