diff options
Diffstat (limited to 'WebCore/rendering/RenderPartObject.cpp')
| -rw-r--r-- | WebCore/rendering/RenderPartObject.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/WebCore/rendering/RenderPartObject.cpp b/WebCore/rendering/RenderPartObject.cpp index cba341b..3867581 100644 --- a/WebCore/rendering/RenderPartObject.cpp +++ b/WebCore/rendering/RenderPartObject.cpp @@ -396,13 +396,8 @@ void RenderPartObject::layout() #else calcWidth(); calcHeight(); -<<<<<<< HEAD:WebCore/rendering/RenderPartObject.cpp #endif - adjustOverflowForBoxShadowAndReflect(); -======= ->>>>>>> webkit.org at 49305:WebCore/rendering/RenderPartObject.cpp - RenderPart::layout(); m_overflow.clear(); |