From 899061b60aaba7c014c26c0ef69c758a84580b3e Mon Sep 17 00:00:00 2001
From: WXD-SEASON\season <season.su@yolipai.com>
Date: Mon, 26 Feb 2024 17:08:27 +0800
Subject: [PATCH] 去掉冲突部分

---
 packageE/pages/cart/cart2/cart2.js | 1 -
 1 file changed, 0 insertions(+), 1 deletion(-)

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});
   },
 
--
libgit2 0.21.4