Removing the conflict marker.
authorthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Dec 2006 00:03:50 +0000 (00:03 +0000)
committerthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Dec 2006 00:03:50 +0000 (00:03 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17952 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

index ba988da7dae584a4c5a3c3f76a4f7a7087e2b3e4..03049bae3fca937a79212656544c12a07207e117 100644 (file)
         Added select portions of this file from WebKit because the pasteboard needed the following function:
         (-[NSAttributedString _web_attributedStringByStrippingAttachmentCharacters]):
 
->>>>>>> .r17909
 2006-11-28  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by harrison