修复合并代码的问题

@@ -13,13 +13,8 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.4.2",
-<<<<<<< HEAD
 	"appid": "wxb1af25a27d6d0cba",
 	"projectname": "%E6%B5%B7%E5%B3%A1%E8%87%AA%E7%84%B6%E4%BA%BA",
-=======
-	"appid": "wxe7d4efda23782b49",
-	"projectname": "%E7%A4%BE%E7%A8%8E%E6%9C%BA%E5%99%A8%E4%BA%BA",
->>>>>>> 机器人dev
 	"debugOptions": {
 		"hidedInDevtools": []
 	},