解决冲突

2024-07-04 15:18:49 +08:00 · 2024-07-04 15:18:49 +08:00 · c1054a2500
parent c8544716f5
commit c1054a2500
1 changed files with 0 additions and 5 deletions
--- 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;