diff options
Diffstat (limited to 'WebCore/rendering/RenderFlexibleBox.cpp')
| -rw-r--r-- | WebCore/rendering/RenderFlexibleBox.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/rendering/RenderFlexibleBox.cpp b/WebCore/rendering/RenderFlexibleBox.cpp index 531477e..f32e6e3 100644 --- a/WebCore/rendering/RenderFlexibleBox.cpp +++ b/WebCore/rendering/RenderFlexibleBox.cpp @@ -242,10 +242,6 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren) #endif setHeight(0); -<<<<<<< HEAD:WebCore/rendering/RenderFlexibleBox.cpp - m_overflowHeight = 0; -======= ->>>>>>> webkit.org at 49305:WebCore/rendering/RenderFlexibleBox.cpp m_flexingChildren = m_stretchingChildren = false; initMaxMarginValues(); |