2 years ago · d2bb775910
--- a/project.config.json
+++ b/project.config.json
@@ -46,10 +46,6 @@
 
				         "minifyWXML": true,
			
 
				         "showES6CompileOption": false,
			
 
				         "useCompilerPlugins": false,
			
 
				-<<<<<<< HEAD
			
 
				-=======
			
 
				-        "useStaticServer": true,
			
 
				->>>>>>> 2ed9f469602b4098ae93acdd19f54c90a7e4c7d5
			
 
				         "ignoreUploadUnusedFiles": true
			
 
				     },
			
 
				     "compileType": "miniprogram",