X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=WebKit%2Fmac%2FChangeLog;h=7e19dd8a46768ca656f9fd7438123ac152ef5e9a;hp=a7d404945e4d7c061da01505a8b4c686f0acf01a;hb=bc994053b8595af2aad5812c10a817c51f2ee936;hpb=d3c8344697760dc30337df74a08b6996a207d2c2

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index a7d404945e4d..7e19dd8a4676 100644
--- 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>