From abe84ba77a867d4f755199021f9b6e10e3af971b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 01 七月 2024 16:29:27 +0800
Subject: [PATCH] 合并冲突
---
src/App.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 4d4f6fb..f010b6d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,8 +25,8 @@
};
</script>
<style>
- /* @import url("../static/alifont/iconfont.css"); */
- @import url("//at.alicdn.com/t/c/font_4457508_5ubi3w3kng.css");
+ @import url("../static/alifont/iconfont.css");
+ /* @import url("//at.alicdn.com/t/c/font_4457508_5ubi3w3kng.css"); */
* {
margin: 0;
--
Gitblit v1.9.3