[webrtc-pc] Pull Request: Clean up conflict marker

dontcallmedom has just submitted a new pull request for 
https://github.com/w3c/webrtc-pc:

== Clean up conflict marker ==
close #652

See https://github.com/w3c/webrtc-pc/pull/679

Received on Monday, 30 May 2016 09:21:45 UTC