diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 85c05ad..dfae732 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -7788,16 +7788,8 @@ Page({
           let item = arr_data[i];
           //找不到活动要剔除
           if (!item.act_name) continue;
-<<<<<<< HEAD
-          if ([1,2,4,6].indexOf(item.prom_type)==-1) continue;
 
-          var s_time=item.warm_uptime;
-          if(!s_time) item.s_time;
-          if(s_time>ut.gettimestamp()) continue;
-
-=======
           if ([1,2,4,6,8].indexOf(item.prom_type)==-1) continue;
->>>>>>> dev_presell
           new_arr.push(item);
         }