合并冲突

2021-06-02 01:10:58 +08:00
parent 43ac4aaab9
commit 8309c2b948
3 changed files with 0 additions and 13 deletions
--- a/assets/css/style.css
+++ b/assets/css/style.css
@ -1879,11 +1879,7 @@ page {
  height: 100%;
 }
 .shoppingCart .list {
-<<<<<<< HEAD
-  margin-top: 76rpx;
-=======
  margin-top: 80rpx;
->>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
 }
 .shoppingCart .list .item {
  padding: 25rpx 30rpx;
--- a/assets/css/style.less
+++ b/assets/css/style.less
@ -2063,11 +2063,7 @@ page {
 }

 .shoppingCart .list {
-<<<<<<< HEAD
-  margin-top: 76rpx;
-=======
  margin-top: .8 * 100rpx;
->>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
 }

 .shoppingCart .list .item {