Build fix.

        * platform/network/mac/ResourceRequestMac.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17913 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0c820763680c413b8bf22b0a06ef940dde562b1f..19c8c5263a5f4c5439bdb6af0e4f143325fab57b 100644 (file)
--- 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 8598020a4b4d3655fd72113d73ae1d39c8c5e637..3ccf8e17ad71b2ea261a8ad136f4c34ff64e909d 100644 (file)
--- 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>