For https://github.com/apache/cordova-ios/pull/388, conflicts needs to be resolved and should be OK for merging since I last reviewed it. Would like a second opinion.
[ Full content available at: https://github.com/apache/cordova/issues/6 ] This message was relayed via gitbox.apache.org for devnull@infra.apache.org
