From 3f252f84468859d129a8c6a9302412d2e6e5a3fa Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 9 Oct 2009 13:27:03 +0100 Subject: Merge webkit.org at R49305 : Fix merge conflicts. Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a --- WebCore/rendering/RenderTextControlMultiLine.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'WebCore/rendering/RenderTextControlMultiLine.cpp') diff --git a/WebCore/rendering/RenderTextControlMultiLine.cpp b/WebCore/rendering/RenderTextControlMultiLine.cpp index f1f60ab..6ff9235 100644 --- a/WebCore/rendering/RenderTextControlMultiLine.cpp +++ b/WebCore/rendering/RenderTextControlMultiLine.cpp @@ -27,13 +27,10 @@ #include "Frame.h" #include "HTMLNames.h" #include "HTMLTextAreaElement.h" -<<<<<<< HEAD:WebCore/rendering/RenderTextControlMultiLine.cpp +#include "HitTestResult.h" #ifdef ANDROID_LAYOUT #include "Settings.h" #endif -======= -#include "HitTestResult.h" ->>>>>>> webkit.org at 49305:WebCore/rendering/RenderTextControlMultiLine.cpp namespace WebCore { -- cgit v1.1