1326

project.config.json

@@ -26,22 +26,9 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-<<<<<<< HEAD
-<<<<<<< HEAD
 		"useIsolateContext": true,
 		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
-=======
-		"useCompilerModule": true,
-		"userConfirmedUseCompilerModuleSwitch": false,
-		"compileHotReLoad": false,
-		"useIsolateContext": true
->>>>>>> 76272386d7c64b0315ecebaf5fac3f49a65ad141
-=======
-		"useIsolateContext": true,
-		"useCompilerModule": true,
-		"userConfirmedUseCompilerModuleSwitch": false
->>>>>>> 1163b2e6643b126c4a73124d4ec61326928d3315
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.11.1",