diff options
Diffstat (limited to 'WebCore/rendering/RenderTextControlMultiLine.cpp')
-rw-r--r-- | WebCore/rendering/RenderTextControlMultiLine.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
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 { |