no message

services/activity.go

@@ -1035,10 +1035,7 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 				havePower = false
 			}
 		}
-<<<<<<< HEAD
-=======
 		//如果主客观校验不通过，那么直接返回
->>>>>>> 45e382030b9631148fdf6168e44f34cc327279d3
 		if !havePower {
 			return
 		}