There is a merge conflict now @schoetty. Could you maybe fix that please? 
Thanks.

[ Full content available at: 
https://github.com/apache/cordova-plugin-media/pull/97 ]
This message was relayed via gitbox.apache.org for [email protected]

Reply via email to