1 files changed, 1 insertions, 4 deletions
diff --git a/Source/WebCore/platform/ScrollView.h b/Source/WebCore/platform/ScrollView.h
index 2bd1447..7df735a 100644
--- a/Source/WebCore/platform/ScrollView.h
+++ b/Source/WebCore/platform/ScrollView.h
@@ -162,16 +162,13 @@ public:
     int contentsWidth() const { return contentsSize().width(); }
     int contentsHeight() const { return contentsSize().height(); }
     virtual void setContentsSize(const IntSize&);
-<<<<<<< HEAD
-   
+
 #if PLATFORM(ANDROID)
     int actualWidth() const;
     int actualHeight() const;
     int actualScrollX() const;
     int actualScrollY() const;
 #endif
-=======
->>>>>>> webkit.org at r78450
 
     // Functions for querying the current scrolled position (both as a point, a size, or as individual X and Y values).
     IntPoint scrollPosition() const { return visibleContentRect().location(); }