From c9542bd95f07a247874a627d5f73ead280237b46 Mon Sep 17 00:00:00 2001
From: aroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 29 Nov 2006 01:51:39 +0000
Subject: [PATCH]         Build fix.

        * platform/network/mac/ResourceRequestMac.mm:



git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 WebCore/ChangeLog                                  | 7 ++++++-
 WebCore/platform/network/mac/ResourceRequestMac.mm | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0c820763680c..19c8c5263a5f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-28  Adam Roben  <aroben@apple.com>
+
+        Build fix.
+
+        * platform/network/mac/ResourceRequestMac.mm:
+
 2006-11-28  David Harrison  <harrison@apple.com>
 
         Reviewed by Adele.
@@ -145,7 +151,6 @@
         (WebCore::Page::chrome):
         (WebCore::Page::contextMenuController):
 
->>>>>>> .r17911
 2006-11-28  Alice Liu  <alice.liu@apple.com>
 
         Reviewed by Justin and Adam.
diff --git a/WebCore/platform/network/mac/ResourceRequestMac.mm b/WebCore/platform/network/mac/ResourceRequestMac.mm
index 8598020a4b4d..3ccf8e17ad71 100644
--- a/WebCore/platform/network/mac/ResourceRequestMac.mm
+++ b/WebCore/platform/network/mac/ResourceRequestMac.mm
@@ -25,10 +25,9 @@
  */
 
 #import "config.h"
-#import "ResourceRequestMac.h"
+#import "ResourceRequest.h"
 
 #import "FormDataStreamMac.h"
-#import "ResourceRequest.h"
 
 #import <Foundation/Foundation.h>
 
-- 
2.36.0