1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/html/HTMLFrameSetElement.cpp b/WebCore/html/HTMLFrameSetElement.cpp
index d0f84ef..09c153d 100644
--- a/WebCore/html/HTMLFrameSetElement.cpp
+++ b/WebCore/html/HTMLFrameSetElement.cpp
@@ -208,14 +208,10 @@ void HTMLFrameSetElement::recalcStyle(StyleChange ch)
 {
     if (needsStyleRecalc() && renderer()) {
         renderer()->setNeedsLayout(true);
-<<<<<<< HEAD
 #ifdef ANDROID_FLATTEN_FRAMESET
         static_cast<RenderFrameSet*>(renderer())->setGridNeedsLayout();
 #endif
-        setNeedsStyleRecalc(NoStyleChange);
-=======
         clearNeedsStyleRecalc();
->>>>>>> webkit.org at r64523
     }
     HTMLElement::recalcStyle(ch);
 }