Removed stray conflict marker.
authorsullivan <sullivan@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 21 Aug 2007 16:28:53 +0000 (16:28 +0000)
committersullivan <sullivan@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 21 Aug 2007 16:28:53 +0000 (16:28 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25170 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

index 64f1ea3767927086054eeec8244cb6019effc2d9..042920d73c5bc722a0d9e34ecbd7c483422158eb 100644 (file)
         (WebCore::RenderPartObject::layout):
         Call updateWidget here if m_widget is 0, causing the plug-in to be instantiated.
         
->>>>>>> .r25158
 2007-08-17  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Maciej.