正在显示
1 个修改的文件
包含
0 行增加
和
5 行删除
| @@ -13,13 +13,8 @@ | @@ -13,13 +13,8 @@ | ||
| 13 | }, | 13 | }, |
| 14 | "compileType": "miniprogram", | 14 | "compileType": "miniprogram", |
| 15 | "libVersion": "2.4.2", | 15 | "libVersion": "2.4.2", |
| 16 | -<<<<<<< HEAD | ||
| 17 | "appid": "wxb1af25a27d6d0cba", | 16 | "appid": "wxb1af25a27d6d0cba", |
| 18 | "projectname": "%E6%B5%B7%E5%B3%A1%E8%87%AA%E7%84%B6%E4%BA%BA", | 17 | "projectname": "%E6%B5%B7%E5%B3%A1%E8%87%AA%E7%84%B6%E4%BA%BA", |
| 19 | -======= | ||
| 20 | - "appid": "wxe7d4efda23782b49", | ||
| 21 | - "projectname": "%E7%A4%BE%E7%A8%8E%E6%9C%BA%E5%99%A8%E4%BA%BA", | ||
| 22 | ->>>>>>> 机器人dev | ||
| 23 | "debugOptions": { | 18 | "debugOptions": { |
| 24 | "hidedInDevtools": [] | 19 | "hidedInDevtools": [] |
| 25 | }, | 20 | }, |
请
注册
或
登录
后发表评论