diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 74c297a..a682bbf 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3657,16 +3657,12 @@ Page({
         success: function (t) {
           if (t.data.code == 0) {
             var g_buy_num = t.data.data.goodsbuynum;
-<<<<<<< HEAD
 			
 			//如果是秒杀的时候
 			if(th.data.prom_type==0 && gd.prom_type == 1 ){
 				gd.prom_type= 0;
 			}
-			
-=======
-						
->>>>>>> dev_group
+
             if (gd.prom_type == 1 || gd.prom_type == 2 || gd.prom_type == 4 || gd.prom_type == 6) {
               //----获取活动购买数----
               getApp().request.get("/api/weshop/ordergoods/getUserBuyGoodsNum", {