Remove conflict marker.
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Nov 2007 10:14:50 +0000 (10:14 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Nov 2007 10:14:50 +0000 (10:14 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27507 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/mac/ChangeLog

index a7d404945e4d7c061da01505a8b4c686f0acf01a..7e19dd8a46768ca656f9fd7438123ac152ef5e9a 100644 (file)
         method to take a MIME type instead of extracting it from the response,
         so that WebDataSource could pass the correct MIME type.
         * WebView/WebResourcePrivate.h:
->>>>>>> trunk:WebKit/ChangeLog
 
 2007-10-17  Darin Adler  <darin@apple.com>