1

egret/resource/default.res.json

@@ -199,14 +199,8 @@
 		{
 			"keys": "redbagtips_ele_png,redbagtips_ele1_png,redbagtips_ele2_png,redbagtips_ele3_png,redbagtips_light_png,redbagtips按钮_png,redbagtips活动规则_png,redbagtipsbg_png,redbagtips_ele7_png",
 			"name": "redbombtips"
-<<<<<<< HEAD
-=======
-		},
-		{
-			"keys": "maplight2_png",
-			"name": "preload"
->>>>>>> bd6bb07f34bd63dfe98b4deac04c19fb31c46a3a
 		}
+
 	],
 	"resources": [
 		{