feafeature：修改冲突

pages/index/index.js

@@ -127,12 +127,10 @@ Page({
     var devicelist = wx.getStorageSync("devicelist") || "";
     if (!strings.isEmpty(devicelist)) {
       var list = JSON.parse(devicelist);
-<<<<<<< Updated upstream
+
       that.updateDeviceList(list, true);
-=======
-      that.updateDeviceList(list, false);
       that.tryConnectBle()
->>>>>>> Stashed changes
+
     }
   },