From bc994053b8595af2aad5812c10a817c51f2ee936 Mon Sep 17 00:00:00 2001
From: "mrowe@apple.com" <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 7 Nov 2007 10:14:50 +0000
Subject: [PATCH] Remove conflict marker.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27507 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 WebKit/mac/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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>
 
-- 
2.36.0