1 files changed, 1 insertions, 6 deletions
diff --git a/WebCore/page/Navigator.h b/WebCore/page/Navigator.h
index 3380c9c..b40bed4 100644
--- a/WebCore/page/Navigator.h
+++ b/WebCore/page/Navigator.h
@@ -33,17 +33,12 @@ namespace WebCore {
     class Frame;
     class Geolocation;
     class PluginData;
-<<<<<<< HEAD
-    class PluginArray;
+    class String;
 #if PLATFORM(ANDROID)
     class ApplicationInstalledCallback;
     class Connection;
 #endif
 
-=======
-    class String;
->>>>>>> webkit.org at r63173
-
     class Navigator : public NavigatorBase, public RefCounted<Navigator> {
     public:
         static PassRefPtr<Navigator> create(Frame* frame) { return adoptRef(new Navigator(frame)); }