diff --git a/www/JPushPlugin.js b/www/JPushPlugin.js
index 61bffa9..6a6d369 100644
--- a/www/JPushPlugin.js
+++ b/www/JPushPlugin.js
@@ -475,10 +475,7 @@ JPushPlugin.prototype.setMaxGeofenceNumber = function(maxNumber) {
   }
 };
 
-<<<<<<< HEAD
 //设置角标
-=======
->>>>>>> a9b5af06a50b0f0fe2efaeb1b88eaf8dc15f805e
 JPushPlugin.prototype.setBadgeNumber = function(badgeNumb) {
   if (device.platform === "Android") {
     this.callNative("setBadgeNumber", [badgeNumb], null);