From 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 02 九月 2025 11:29:23 +0800
Subject: [PATCH] 合并冲突掉的代码

---
 src/main.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main.js b/src/main.js
index 014954c..00205af 100644
--- a/src/main.js
+++ b/src/main.js
@@ -22,6 +22,7 @@
 import "virtual:svg-icons-register";
 import SvgIcon from "@/components/SvgIcon";
 import elementIcons from "@/components/SvgIcon/svgicon";
+import "./assets/fonts/font.css";
 
 import "./permission"; // permission control
 

--
Gitblit v1.9.3