From c1054a2500f919d8c606a756659bf96ddec001b8 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 4 Jul 2024 15:18:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/pay.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/my/order/pay.vue b/my/order/pay.vue
index 09ebdbf..6cebb89 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -2018,11 +2018,6 @@
 		padding: 29rpx;
 	}
 	.content{
-<<<<<<< .mine
-
-=======
-		// padding-bottom: 140rpx;
->>>>>>> .theirs
 		 padding-top: 20px;
 		 width: 100%;
 		 background-color: #f7f7f7;