2 files changed, 4 insertions, 11 deletions
diff --git a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp b/Source/WebCore/platform/image-decoders/ImageDecoder.cpp
index 2aae205..840ab98 100644
--- a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp
+++ b/Source/WebCore/platform/image-decoders/ImageDecoder.cpp
@@ -55,12 +55,6 @@ unsigned copyFromSharedBuffer(char* buffer, unsigned bufferLength, const SharedB
     return bytesExtracted;
 }
 
-<<<<<<< HEAD
-#if !OS(ANDROID)
-// This method requires BMPImageDecoder, PNGImageDecoder, ICOImageDecoder and
-// JPEGDecoder, which aren't used on Android, and which don't all compile.
-// TODO: Find a better fix.
-=======
 bool matchesGIFSignature(char* contents)
 {
     return !memcmp(contents, "GIF8", 4);
@@ -100,7 +94,10 @@ bool matchesCURSignature(char* contents)
 
 }
 
->>>>>>> webkit.org at r78450
+#if !OS(ANDROID)
+// This method requires BMPImageDecoder, PNGImageDecoder, ICOImageDecoder and
+// JPEGDecoder, which aren't used on Android, and which don't all compile.
+// TODO: Find a better fix.
 ImageDecoder* ImageDecoder::create(const SharedBuffer& data, ImageSource::AlphaOption alphaOption, ImageSource::GammaAndColorProfileOption gammaAndColorProfileOption)
 {
     static const unsigned lengthOfLongestSignature = 14; // To wit: "RIFF????WEBPVP"
diff --git a/Source/WebCore/platform/image-decoders/ImageDecoder.h b/Source/WebCore/platform/image-decoders/ImageDecoder.h
index 7d0d0d4..e07f4f2 100644
--- a/Source/WebCore/platform/image-decoders/ImageDecoder.h
+++ b/Source/WebCore/platform/image-decoders/ImageDecoder.h
@@ -180,11 +180,7 @@ namespace WebCore {
                     g = static_cast<unsigned>(g * alphaPercent);
                     b = static_cast<unsigned>(b * alphaPercent);
                 }
-<<<<<<< HEAD
-#if PLATFORM(ANDROID)
-=======
 #if PLATFORM(SKIA)
->>>>>>> webkit.org at r78450
                 *dest = SkPackARGB32(a, r, g, b);
 #else
                 *dest = (a << 24 | r << 16 | g << 8 | b);