From 9d6f9a930c809d63d915df77798bc3d3212bb40d Mon Sep 17 00:00:00 2001
From: WXD-SEASON\season <season.su@yolipai.com>
Date: Thu, 6 Jul 2023 17:57:51 +0800
Subject: [PATCH] 冲突3

---
 packageC/pages/presell/cart/cart2_pre.wxml | 4 ----
 1 file changed, 0 insertions(+), 4 deletions(-)

diff --git a/packageC/pages/presell/cart/cart2_pre.wxml b/packageC/pages/presell/cart/cart2_pre.wxml
index 72686ef..bf27c36 100644
--- a/packageC/pages/presell/cart/cart2_pre.wxml
+++ b/packageC/pages/presell/cart/cart2_pre.wxml
@@ -123,10 +123,6 @@
             </view>
           </view>
         </view>
-<<<<<<< HEAD
-
-=======
->>>>>>> 33b100b85758e70b0abfa89ba1e4bf25e025e03d
                 
                 <view class="coupon-mes flex-vertical">
                     <view>留言</view>
--
libgit2 0.21.4