You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
15 lines
753 B
15 lines
753 B
{
|
|
<<<<<<< HEAD
|
|
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
|
|
"projectname": "changshu",
|
|
"setting": {
|
|
"compileHotReLoad": true
|
|
}
|
|
=======
|
|
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
|
|
"projectname": "taihumeisu",
|
|
"setting": {
|
|
"compileHotReLoad": true
|
|
}
|
|
>>>>>>> 64176ed88ad71ab059733f680f3efd443a60f371
|
|
}
|