conflict

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/param/RuleParamHelper.java

@@ -1,9 +1,5 @@
 package com.tzld.piaoquan.ad.engine.service.predict.param;
 
-<<<<<<< HEAD
-=======
-import com.tzld.piaoquan.ad.engine.commons.redis.AdOwnRedisHelper;
->>>>>>> 1785b31 (fixbug)
 import com.tzld.piaoquan.ad.engine.commons.redis.AlgorithmRedisHelper;
 import com.tzld.piaoquan.ad.engine.service.predict.constant.RuleRedisKeyConst;
 import org.apache.commons.lang3.StringUtils;