From 5596cc695d444d9ef13661148d6e227f8ed3171e Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期四, 28 七月 2022 20:25:37 +0800
Subject: [PATCH] '冲突解决'

---
 App.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/App.vue b/App.vue
index 7d90a6b..5111643 100644
--- a/App.vue
+++ b/App.vue
@@ -15,5 +15,5 @@
 <style lang="scss">
 	/*姣忎釜椤甸潰鍏叡css */
 	@import '@/uni_modules/uview-ui/index.scss';
-	@import "./static/iconfont/iconfont.css";
+	@import "@/static/iconfont/iconfont.css";
 </style>

--
Gitblit v1.9.1