2 files changed, 0 insertions, 22 deletions
diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp
index 99c8fcd..9c29071 100644
--- a/Source/WebCore/page/DOMWindow.cpp
+++ b/Source/WebCore/page/DOMWindow.cpp
@@ -1612,19 +1612,6 @@ EventTargetData* DOMWindow::ensureEventTargetData()
     return &m_eventTargetData;
 }
 
-<<<<<<< HEAD
-#if ENABLE(BLOB)
-String DOMWindow::createObjectURL(Blob* blob)
-{
-    return scriptExecutionContext()->createPublicBlobURL(blob).string();
-}
-
-void DOMWindow::revokeObjectURL(const String& blobURLString)
-{
-    scriptExecutionContext()->revokePublicBlobURL(KURL(KURL(), blobURLString));
-}
-#endif
-
 #if ENABLE(DOM_STORAGE) && defined(ANDROID)
 void DOMWindow::clearDOMStorage()
 {
@@ -1638,8 +1625,6 @@ void DOMWindow::clearDOMStorage()
 }
 #endif
 
-=======
->>>>>>> WebKit.org @ r75993
 void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DOMWindow* firstWindow, SetLocationLocking locking)
 {
     Frame* activeFrame = activeWindow->frame();
diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
index b864aa2..c4d5ca4 100644
--- a/Source/WebCore/page/Page.cpp
+++ b/Source/WebCore/page/Page.cpp
@@ -95,17 +95,10 @@
 #include "GeolocationController.h"
 #endif
 
-<<<<<<< HEAD
-#if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
-#include "InspectorApplicationCacheAgent.h"
-#endif
-
 #if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
 #include "PackageNotifier.h"
 #endif
 
-=======
->>>>>>> WebKit.org @ r75993
 namespace WebCore {
 
 static HashSet<Page*>* allPages;