|
@@ -46,10 +46,6 @@
|
|
|
"minifyWXML": true,
|
|
"minifyWXML": true,
|
|
|
"showES6CompileOption": false,
|
|
"showES6CompileOption": false,
|
|
|
"useCompilerPlugins": false,
|
|
"useCompilerPlugins": false,
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
-=======
|
|
|
|
|
- "useStaticServer": true,
|
|
|
|
|
->>>>>>> 2ed9f469602b4098ae93acdd19f54c90a7e4c7d5
|
|
|
|
|
"ignoreUploadUnusedFiles": true
|
|
"ignoreUploadUnusedFiles": true
|
|
|
},
|
|
},
|
|
|
"compileType": "miniprogram",
|
|
"compileType": "miniprogram",
|
