Remove conflict marker.

[WebKit-https.git] / WebKit / mac / ChangeLog

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index a7d404945e4d7c061da01505a8b4c686f0acf01a..7e19dd8a46768ca656f9fd7438123ac152ef5e9a 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -464,7 +464,6 @@
         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>