Conflict marker removed
authorbeidson <beidson@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Sep 2006 20:34:15 +0000 (20:34 +0000)
committerbeidson <beidson@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Sep 2006 20:34:15 +0000 (20:34 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16304 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

index 57d3f321d1f3885f8c33f7f870a8f2504c94e9ba..a37e5e851ead030805297d8489b0f6f72dc575ed 100644 (file)
         (WebCore::CSSParser::parseSVGPaint):
         (WebCore::CSSParser::parseSVGColor):
 
->>>>>>> .r16300
 2006-09-07  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by Darin and Tim H.