3 files changed, 5 insertions, 17 deletions
diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp
index 1747273..ff94b76 100644
--- a/Source/WebCore/html/HTMLCanvasElement.cpp
+++ b/Source/WebCore/html/HTMLCanvasElement.cpp
@@ -342,12 +342,8 @@ String HTMLCanvasElement::toDataURL(const String& mimeType, const double* qualit
     if (mimeType.isNull() || !MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(lowercaseMimeType))
         lowercaseMimeType = "image/png";
 
-<<<<<<< HEAD
-#if PLATFORM(CG) || (USE(SKIA) && !PLATFORM(ANDROID))
+#if USE(CG) || (USE(SKIA) && !PLATFORM(ANDROID))
     // FIXME: Consider using this code path on Android. http://b/4572024
-=======
-#if USE(CG) || USE(SKIA)
->>>>>>> WebKit.org at r84325
     // Try to get ImageData first, as that may avoid lossy conversions.
     RefPtr<ImageData> imageData = getImageData();
 
diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp
index 83e8c7d..d5d0aee 100644
--- a/Source/WebCore/html/HTMLInputElement.cpp
+++ b/Source/WebCore/html/HTMLInputElement.cpp
@@ -443,21 +443,15 @@ void HTMLInputElement::setType(const String& type)
 
 void HTMLInputElement::updateType()
 {
-<<<<<<< HEAD
-    const AtomicString& typeString = fastGetAttribute(typeAttr);
-
-    OwnPtr<InputType> newType = InputType::create(this, typeString);
+    OwnPtr<InputType> newType = InputType::create(this, fastGetAttribute(typeAttr));
 #ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
     if (newType->isPasswordField() && document()->focusedNode() == this)
         PlatformBridge::updateTextfield(document()->view(), this, true, String());
 #endif
-=======
-    OwnPtr<InputType> newType = InputType::create(this, fastGetAttribute(typeAttr));
     bool hadType = m_hasType;
     m_hasType = true;
     if (m_inputType->formControlType() == newType->formControlType())
         return;
->>>>>>> WebKit.org at r84325
 
     if (hadType && !newType->canChangeFromAnotherType()) {
         // Set the attribute back to the old value.
diff --git a/Source/WebCore/html/RangeInputType.h b/Source/WebCore/html/RangeInputType.h
index b7af291..358a638 100644
--- a/Source/WebCore/html/RangeInputType.h
+++ b/Source/WebCore/html/RangeInputType.h
@@ -69,14 +69,12 @@ private:
     virtual String fallbackValue();
     virtual String sanitizeValue(const String& proposedValue);
     virtual bool shouldRespectListAttribute();
-<<<<<<< HEAD
+
+    SliderThumbElement* shadowSliderThumb() const;
+
 #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS)
     virtual void handleTouchStartEvent(TouchEvent*);
 #endif
-=======
-
-    SliderThumbElement* shadowSliderThumb() const;
->>>>>>> WebKit.org at r84325
 };
 
 } // namespace WebCore