diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 06e0f86..bb43f53 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -9096,7 +9096,6 @@ Page({
       mark:true
     })
     //-- 重新计算一下价格 --
->>>>>>> dev_oa_fuordercx
     this.get_cart_next(null, 1, {prom_type: 0, prom_id: 0});
   },