Resolve conflicts.

This commit is contained in:
Hevin 2017-03-09 17:19:59 +08:00
commit 20ab9319bc

View File

@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="jpush-phonegap-plugin"
version="3.1.0">
version="3.1.1">
<name>JPush Plugin</name>
<description>JPush for cordova plugin</description>
@ -177,9 +177,9 @@
</receiver>
<!-- Required SDK核心功能-->
<receiver
android:name="cn.jpush.android.service.AlarmReceiver"
android:exported="false" />
<receiver
android:name="cn.jpush.android.service.AlarmReceiver"
android:exported="false" />
<!-- Required. Enable it you can get statistics data with channel -->
<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />