From ca9a92cfc2f2bd8c724020ee5e46094633eb80a5 Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期五, 12 七月 2024 17:39:45 +0800
Subject: [PATCH] 处理冲突

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

diff --git a/src/main.js b/src/main.js
index 0c86025..9fc3d94 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,10 +3,10 @@
 import App from './App.vue';
 import ElementPlus from 'element-plus';
 import 'element-plus/dist/index.css';
+import 'xgplayer/dist/index.min.css'; // 寮曞叆瑗跨摐瑙嗛鏍峰紡
 import router from '@/router/index.js';
 import pinia from './store';
 import VueUeditorWrap from 'vue-ueditor-wrap';
-
 
 const app = createApp(App);
 app.use(router);

--
Gitblit v1.8.0