2 files changed, 0 insertions, 19 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 03ad8e7..2528b3a 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -432,14 +432,10 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
 
 #if !PLATFORM(ANDROID)
     m_axObjectCache = 0;
-<<<<<<< HEAD
 #endif
-    
-=======
 
     m_markers = new DocumentMarkerController();
 
->>>>>>> webkit.org at r66079
     m_docLoader = new DocLoader(this);
 
     m_visuallyOrdered = false;
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index ff7e646..18dc838 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -1169,18 +1169,10 @@ private:
 
     OwnPtr<RenderArena> m_renderArena;
 
-<<<<<<< HEAD
-    typedef std::pair<Vector<DocumentMarker>, Vector<IntRect> > MarkerMapVectorPair;
-    typedef HashMap<RefPtr<Node>, MarkerMapVectorPair*> MarkerMap;
-    MarkerMap m_markers;
-
 #if !PLATFORM(ANDROID)
     mutable AXObjectCache* m_axObjectCache;
 #endif
-=======
-    mutable AXObjectCache* m_axObjectCache;
     OwnPtr<DocumentMarkerController> m_markers;
->>>>>>> webkit.org at r66079
     
     Timer<Document> m_updateFocusAppearanceTimer;
 
@@ -1202,13 +1194,6 @@ private:
     RefPtr<Document> m_transformSourceDocument;
 #endif
 
-<<<<<<< HEAD
-#if ENABLE(XBL)
-    OwnPtr<XBLBindingManager> m_bindingManager; // The access point through which documents and elements communicate with XBL.
-#endif
-
-=======
->>>>>>> webkit.org at r66079
     typedef HashMap<AtomicStringImpl*, HTMLMapElement*> ImageMapsByName;
     ImageMapsByName m_imageMapsByName;