From bca7fa09af6e9d17f7e10b42bb6d1d3ea4a7ef1b Mon Sep 17 00:00:00 2001
From: "mallinath@webrtc.org"
 <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 19 Aug 2011 16:39:18 +0000
Subject: [PATCH] Review URL: http://webrtc-codereview.appspot.com/118001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@406 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../source/talk/app/webrtc/webrtcsession.cc       | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/webrtcsession.cc b/third_party_mods/libjingle/source/talk/app/webrtc/webrtcsession.cc
index 3325e5ba52..67d6dd097f 100644
--- a/third_party_mods/libjingle/source/talk/app/webrtc/webrtcsession.cc
+++ b/third_party_mods/libjingle/source/talk/app/webrtc/webrtcsession.cc
@@ -523,21 +523,6 @@ bool WebRtcSession::OnRemoteDescription(
   return true;
 }
 
-<<<<<<< .mine
-=======
-void WebRtcSession::ProcessTerminateAccept(cricket::SessionDescription* desc) {
-  const cricket::ContentInfo* video_content = GetFirstVideoContent(desc);
-  if (video_content) {
-    SignalRemoveStream(video_content->name, true);
-  } else {
-    const cricket::ContentInfo* audio_content = GetFirstAudioContent(desc);
-    if (audio_content) {
-      SignalRemoveStream(audio_content->name, false);
-    }
-  }
-}
-
->>>>>>> .r402
 bool WebRtcSession::CheckForStreamDeleteMessage(
     const std::vector<cricket::Candidate>& candidates) {
   for (size_t i = 0; i < candidates.size(); ++i) {