update

@@ -393,16 +393,12 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
 
 			JSONObject result = new JSONObject();
 			result.put("landing_page_url",StringUtils.isEmpty(mktMarketingUrl.getLandingPageUrl()) ? "" : mktMarketingUrl.getLandingPageUrl());
-
-<<<<<<< HEAD
+			
 			if (union != null && union.getIsActivate() != null && union.getIsActivate().byteValue() == 1) {
 				// 如果90天之内有过激活日志，则不允许重复激活
 				log.warn("activateUnion error because 90 days has activate info with param is {}", request);
 				return new UnionResponse(200, "have activite in 90 days",result);
 			}
-=======
-//			UnionTypeModel u = UnionConstant.unionTypeMap.get(Integer.parseInt(click.getUnion_type()));
->>>>>>> master
 
 			UnionTypeModel u = new UnionTypeModel();
 			u.setName(mktMarketingUrl.getName());