From 50072669bacb4c0fc842817ea0129cef98932d0b Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期四, 28 七月 2022 20:01:24 +0800
Subject: [PATCH] '解决冲突'
---
pages/home/home.vue | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index e53f9b8..eb6a9a3 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -691,9 +691,12 @@
justify-content: center;
align-content: center;
margin-right: vww(10);
+<<<<<<< Updated upstream
&:nth-last-child(1) {
margin-right: 0;
}
+=======
+>>>>>>> Stashed changes
view {
display: inline-block;
}
--
Gitblit v1.9.1