2 files changed, 0 insertions, 12 deletions
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp
index 5689e73..5050237 100644
--- a/WebCore/html/HTMLInputElement.cpp
+++ b/WebCore/html/HTMLInputElement.cpp
@@ -60,13 +60,10 @@
 #include "RenderTextControlSingleLine.h"
 #include "RenderTheme.h"
 #include "TextEvent.h"
-<<<<<<< HEAD:WebCore/html/HTMLInputElement.cpp
 #ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
 #include "WebViewCore.h"
 #endif
-=======
 #include <wtf/MathExtras.h>
->>>>>>> webkit.org at 49305:WebCore/html/HTMLInputElement.cpp
 #include <wtf/StdLibExtras.h>
 
 using namespace std;
diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp
index e90db4a..0136e08 100644
--- a/WebCore/html/HTMLMediaElement.cpp
+++ b/WebCore/html/HTMLMediaElement.cpp
@@ -1630,20 +1630,11 @@ void HTMLMediaElement::updatePlayState()
         m_playbackProgressTimer.stop();
         m_playing = false;
         float time = currentTime();
-<<<<<<< HEAD:WebCore/html/HTMLMediaElement.cpp
-        if (m_lastSeekTime < time)
-            m_playedTimeRanges->add(m_lastSeekTime, time);
-=======
         if (time > m_lastSeekTime)
             addPlayedRange(m_lastSeekTime, time);
->>>>>>> webkit.org at 49305:WebCore/html/HTMLMediaElement.cpp
     } else if (couldPlayIfEnoughData() && playerPaused)
         m_player->prepareToPlay();
-<<<<<<< HEAD:WebCore/html/HTMLMediaElement.cpp
-
-=======
     
->>>>>>> webkit.org at 49305:WebCore/html/HTMLMediaElement.cpp
     if (renderer())
         renderer()->updateFromElement();
 }