gengxin

app.json

@@ -50,12 +50,6 @@
         "iconPath": "images/tabBar004.png",
         "pagePath": "pages/me/me",
         "text": "我的"
-      },
-      {
-        "selectedIconPath": "images/tabBar014.png",
-        "iconPath": "images/tabBar004.png",
-        "pagePath": "pages/login/login",
-        "text": "login"
       }
     ]
   },

project.config.json

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