Commit b9fc7fa2 authored by ggaren's avatar ggaren

Remove conflict marker from ChangeLog


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@11842 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3d613f1f
......@@ -202,7 +202,6 @@
* ksvg2/svg/SVGRectElementImpl.cpp:
(SVGRectElementImpl::toPathData): fixed round rect calculations
>>>>>>> 1.66
2005-12-29 Mark Rowe <opendarwin.org@bdash.net.nz>
Reviewed by eseidel, ggaren, darin.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment