wxd / MShopWeApp

Commit 9d6f9a930c809d63d915df77798bc3d3212bb40d

Authored by WXD-SEASON\season
1 parent cb79d34e

冲突3

Inline Side-by-side
Showing 1 changed file with 0 additions and 4 deletions
packageC/pages/presell/cart/cart2_pre.wxml
  View file @9d6f9a9
... ... @@ -123,10 +123,6 @@
123 123 </view>
124 124 </view>
125 125 </view>
126   -<<<<<<< HEAD
127   -
128   -=======
129   ->>>>>>> 33b100b85758e70b0abfa89ba1e4bf25e025e03d
130 126  
131 127 <view class="coupon-mes flex-vertical">
132 128 <view>留言</view>
... ...